GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-20 22:33:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

recur: Migrated from ISO8601d to Datetime

Browse source
This commit is contained in:
Paul Beckingham 2016-12-17 22:36:29 -05:00
parent afe6bdbfb3
commit c64e019f29
2 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.h
View file

@ -33,13 +33,13 @@
#include <map> #include <map>
#include <sys/types.h> #include <sys/types.h>
#include <Context.h> #include <Context.h>
#include <ISO8601.h> #include <Datetime.h>
#include <Color.h> #include <Color.h>
// recur.cpp // recur.cpp
void handleRecurrence (); void handleRecurrence ();
ISO8601d getNextRecurrence (ISO8601d&, std::string&); Datetime getNextRecurrence (Datetime&, std::string&);
bool generateDueDates (Task&, std::vector <ISO8601d>&); bool generateDueDates (Task&, std::vector <Datetime>&);
void updateRecurrenceMask (Task&); void updateRecurrenceMask (Task&);
bool nag (Task&); bool nag (Task&);

60
src/recur.cpp
View file

@ -39,7 +39,7 @@
#include <time.h> #include <time.h>
#include <Context.h> #include <Context.h>
#include <Lexer.h> #include <Lexer.h>
#include <ISO8601.h> #include <Datetime.h>
#include <Duration.h> #include <Duration.h>
#include <format.h> #include <format.h>
#include <util.h> #include <util.h>
@ -60,7 +60,7 @@ void handleRecurrence ()
return; return;
auto tasks = context.tdb2.pending.get_tasks (); auto tasks = context.tdb2.pending.get_tasks ();
ISO8601d now; Datetime now;
// Look at all tasks and find any recurring ones. // Look at all tasks and find any recurring ones.
for (auto& t : tasks) for (auto& t : tasks)
@ -69,7 +69,7 @@ void handleRecurrence ()
{ {
// Generate a list of due dates for this recurring task, regardless of // Generate a list of due dates for this recurring task, regardless of
// the mask. // the mask.
std::vector <ISO8601d> due; std::vector <Datetime> due;
if (!generateDueDates (t, due)) if (!generateDueDates (t, due))
{ {
// Determine the end date. // Determine the end date.
@ -101,9 +101,9 @@ void handleRecurrence ()
if (t.has ("wait")) if (t.has ("wait"))
{ {
ISO8601d old_wait (t.get_date ("wait")); Datetime old_wait (t.get_date ("wait"));
ISO8601d old_due (t.get_date ("due")); Datetime old_due (t.get_date ("due"));
ISO8601d due (d); Datetime due (d);
rec.set ("wait", format ((due + (old_wait - old_due)).toEpoch ())); rec.set ("wait", format ((due + (old_wait - old_due)).toEpoch ()));
rec.setStatus (Task::waiting); rec.setStatus (Task::waiting);
mask += 'W'; mask += 'W';
@ -139,7 +139,7 @@ void handleRecurrence ()
else else
{ {
if (t.has ("until") && if (t.has ("until") &&
ISO8601d (t.get_date ("until")) < now) Datetime (t.get_date ("until")) < now)
{ {
t.setStatus (Task::deleted); t.setStatus (Task::deleted);
context.tdb2.modify(t); context.tdb2.modify(t);
@ -154,27 +154,27 @@ void handleRecurrence ()
// period (recur). Then generate a set of corresponding dates. // period (recur). Then generate a set of corresponding dates.
// //
// Returns false if the parent recurring task is depleted. // Returns false if the parent recurring task is depleted.
bool generateDueDates (Task& parent, std::vector <ISO8601d>& allDue) bool generateDueDates (Task& parent, std::vector <Datetime>& allDue)
{ {
// Determine due date, recur period and until date. // Determine due date, recur period and until date.
ISO8601d due (parent.get_date ("due")); Datetime due (parent.get_date ("due"));
if (due._date == 0) if (due._date == 0)
return false; return false;
std::string recur = parent.get ("recur"); std::string recur = parent.get ("recur");
bool specificEnd = false; bool specificEnd = false;
ISO8601d until; Datetime until;
if (parent.get ("until") != "") if (parent.get ("until") != "")
{ {
until = ISO8601d (parent.get ("until")); until = Datetime (parent.get ("until"));
specificEnd = true; specificEnd = true;
} }
int recurrence_limit = context.config.getInteger ("recurrence.limit"); int recurrence_limit = context.config.getInteger ("recurrence.limit");
int recurrence_counter = 0; int recurrence_counter = 0;
ISO8601d now; Datetime now;
for (ISO8601d i = due; ; i = getNextRecurrence (i, recur)) for (Datetime i = due; ; i = getNextRecurrence (i, recur))
{ {
allDue.push_back (i); allDue.push_back (i);
@ -202,7 +202,7 @@ bool generateDueDates (Task& parent, std::vector <ISO8601d>& allDue)
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
ISO8601d getNextRecurrence (ISO8601d& current, std::string& period) Datetime getNextRecurrence (Datetime& current, std::string& period)
{ {
int m = current.month (); int m = current.month ();
int d = current.day (); int d = current.day ();
@ -221,10 +221,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (period == "weekdays") else if (period == "weekdays")
@ -251,10 +251,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (period[0] == 'P' && else if (period[0] == 'P' &&
@ -270,10 +270,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y); return Datetime (y, m, d);
} }
else if (period == "quarterly" || else if (period == "quarterly" ||
@ -286,10 +286,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (Lexer::isDigit (period[0]) && period[period.length () - 1] == 'q') else if (Lexer::isDigit (period[0]) && period[period.length () - 1] == 'q')
@ -303,10 +303,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (period == "semiannual" || else if (period == "semiannual" ||
@ -319,10 +319,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (period == "bimonthly" || else if (period == "bimonthly" ||
@ -335,10 +335,10 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
++y; ++y;
} }
while (! ISO8601d::valid (m, d, y)) while (! Datetime::valid (y, m, d))
--d; --d;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (period == "biannual" || else if (period == "biannual" ||
@ -347,7 +347,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
{ {
y += 2; y += 2;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
else if (period == "annual" || else if (period == "annual" ||
@ -361,7 +361,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
if (m == 2 && d == 29) if (m == 2 && d == 29)
d = 28; d = 28;
return ISO8601d (m, d, y, ho, mi, se); return Datetime (y, m, d, ho, mi, se);
} }
// Add the period to current, and we're done. // Add the period to current, and we're done.