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

Task: Duration replaced by ISO8601p

Browse source
This commit is contained in:
Paul Beckingham 2015-08-12 08:24:22 -04:00
parent f17187a4b6
commit 392a5dacd9
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Task.cpp
View file

@ -39,7 +39,7 @@
#include <Nibbler.h> #include <Nibbler.h>
#endif #endif
#include <Date.h> #include <Date.h>
#include <Duration.h> #include <ISO8601.h>
#include <Task.h> #include <Task.h>
#ifdef PRODUCT_TASKWARRIOR #ifdef PRODUCT_TASKWARRIOR
#include <RX.h> #include <RX.h>
@ -55,7 +55,6 @@
#include <Variant.h> #include <Variant.h>
#include <Filter.h> #include <Filter.h>
#include <Dates.h> #include <Dates.h>
#include <ISO8601.h>
#define APPROACHING_INFINITY 1000 // Close enough. This isn't rocket surgery. #define APPROACHING_INFINITY 1000 // Close enough. This isn't rocket surgery.
@ -1467,7 +1466,7 @@ void Task::validate (bool applyDefault /* = true */)
{ {
if (context.columns["due"]->validate (Task::defaultDue)) if (context.columns["due"]->validate (Task::defaultDue))
{ {
Duration dur (Task::defaultDue); ISO8601p dur (Task::defaultDue);
if ((time_t) dur != 0) if ((time_t) dur != 0)
set ("due", (Date () + dur).toEpoch ()); set ("due", (Date () + dur).toEpoch ());
else else
@ -1533,13 +1532,10 @@ void Task::validate (bool applyDefault /* = true */)
if (has ("recur")) if (has ("recur"))
{ {
std::string value = get ("recur"); std::string value = get ("recur");
if (value != "")
Duration d;
std::string::size_type i = 0;
if (! d.parse (value, i))
{ {
i = 0;
ISO8601p p; ISO8601p p;
std::string::size_type i = 0;
if (! p.parse (value, i)) if (! p.parse (value, i))
throw format (STRING_TASK_VALID_RECUR, value); throw format (STRING_TASK_VALID_RECUR, value);
} }