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

Recurrence: Duration replaced by ISO8601p

Browse source
This commit is contained in:
Paul Beckingham 2015-08-12 07:52:17 -04:00
parent aab9ea1563
commit ab7f0741d0
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/recur.cpp
View file

@ -40,7 +40,7 @@
#include <Context.h>
#include <Date.h>
#include <Duration.h>
#include <ISO8601.h>
#include <Lexer.h>
#include <ISO8601.h>
#include <text.h>
@ -368,27 +368,14 @@ Date getNextRecurrence (Date& current, std::string& period)
return Date (m, d, y);
}
// If the period is an 'easy' one, add it to current, and we're done.
// If it throws an error, the duration was not recognized.
// Add the period to current, and we're done.
int secs = 0;
std::string::size_type idx = 0;
Duration du;
if (du.parse (period, idx))
{
secs = du;
}
else
{
idx = 0;
ISO8601p p;
if (p.parse (period, idx))
{
secs = p;
}
else
throw std::string (format (STRING_TASK_VALID_RECUR, period));
}
ISO8601p p;
if (! p.parse (period, idx))
throw std::string (format (STRING_TASK_VALID_RECUR, period));
secs = (time_t) p;
return current + secs;
}