Recurring Tasks - new "weekdays" frequency

- Added support for "weekdays" as a recurrence frequency, which skips
  Saturday and Sunday, but is otherwise a daily recurrence.  Thanks
  to Chris Pride.

src/task.cpp

@@ -565,6 +565,18 @@ Date getNextRecurrence (Date& current, std::string& period)
     return Date (m, d, y);
   }
 
+  if (period == "weekdays")
+  {
+    int dow = current.dayOfWeek ();
+    int days;
+
+         if (dow == 5) days = 3;
+    else if (dow == 6) days = 2;
+    else               days = 1;
+
+    return current + (days * 86400);
+  }
+
   if (isdigit (period[0]) && period[period.length () - 1] == 'm')
   {
     std::string numeric = period.substr (0, period.length () - 1);

src/tests/recur.t

@@ -54,9 +54,6 @@ $output = qx{../task rc:recur.rc desc};
 like ($output, qr/second .* third .* first/msx, 'weekly 3d daily');
 
 # Cleanup.
-unlink 'shadow.txt';
-ok (!-r 'shadow.txt', 'Removed shadow.txt');
-
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data');
 

src/tests/recur.weekdays.t

@@ -0,0 +1,64 @@
+#! /usr/bin/perl
+################################################################################
+## task - a command line task list manager.
+##
+## Copyright 2006 - 2009, Paul Beckingham.
+## All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 7;
+
+# Create the rc file.
+if (open my $fh, '>', 'recur.rc')
+{
+  print $fh "data.location=.\n";
+  close $fh;
+  ok (-r 'recur.rc', 'Created recur.rc');
+}
+
+# Create a few recurring tasks, and test the sort order of the recur column.
+qx{../task rc:recur.rc add due:friday recur:weekdays one};
+my $output = qx{../task rc:recur.rc list};
+like ($output, qr/one/, 'recur weekdays');
+
+$output = qx{../task rc:recur.rc info 1};
+like ($output, qr/Status\s+Recurring/,    'task is recurring');
+like ($output, qr/Recurrence\s+weekdays/, 'task recurs every weekday');
+
+qx{../task rc:recur.rc do 1};
+$output = qx{../task rc:recur.rc list};
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'completed.data';
+ok (!-r 'completed.data', 'Removed completed.data');
+
+unlink 'recur.rc';
+ok (!-r 'recur.rc', 'Removed recur.rc');
+
+exit 0;
+

src/util.cpp

@@ -250,6 +250,7 @@ int convertDuration (const std::string& input)
   std::vector <std::string> supported;
   supported.push_back ("daily");
   supported.push_back ("day");
+  supported.push_back ("weekdays");
   supported.push_back ("weekly");
   supported.push_back ("sennight");
   supported.push_back ("biweekly");
@@ -269,6 +270,7 @@ int convertDuration (const std::string& input)
     std::string found = matches[0];
 
          if (found == "daily"    || found == "day")       return 1;
+    else if (found == "weekdays")                         return 1;
     else if (found == "weekly"   || found == "sennight")  return 7;
     else if (found == "biweekly" || found == "fortnight") return 14;
     else if (found == "monthly")                          return 30;