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

Bug #972, #1018

Browse source 
- Fixed bug that accepted a recurrence duration of '7' as '7secs' instead
  of the intended '7days'.  It is now an error to omit the units.  Thanks to
  Vlad Zhivotnev, Stanley G.
- Modified unit tests to avoid a different error.
This commit is contained in:
Paul Beckingham 2012-07-08 14:21:16 -04:00
parent c4a61566af
commit 99b0c5568a
5 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Duration.cpp
View file

@ -135,11 +135,16 @@ Duration::Duration (const std::string& input)
{
if (digitsOnly (input))
{
_secs = (time_t) strtol (input.c_str (), NULL, 10);
_negative = false;
time_t value = (time_t) strtol (input.c_str (), NULL, 10);
if (value == 0 || value > 60)
{
_secs = value;
_negative = false;
return;
}
}
else
parse (input);
parse (input);
}
////////////////////////////////////////////////////////////////////////////////
@ -362,8 +367,9 @@ bool Duration::valid (const std::string& input)
n.getUntilEOS (units);
// Non-trivial value with no units means the duration is specified in
// seconds, and therefore a time_t. Consider it valid.
if (value != 0.0 &&
// seconds, and therefore a time_t. Consider it valid provided it is >= 60.
if (value != 0.0 &&
value >= 60.0 &&
units == "")
return true;
@ -401,13 +407,13 @@ void Duration::parse (const std::string& input)
_negative = false;
// If no units are provided, assume seconds.
if (n.depleted ())
std::string units;
if (n.depleted () && value >= 60)
{
_secs = (long) value;
return;
}
std::string units;
n.getUntilEOS (units);
// Auto complete against all supported durations.