data: Added support for 'for <duration>' and removed the last use of 'since'

This commit is contained in:
Paul Beckingham 2016-05-03 08:05:10 -04:00
parent 252a470ef8
commit 7d3fb34a87

View file

@ -154,7 +154,7 @@ Interval getFilter (const CLI& cli)
// from/since <date> for <duration>
else if (args.size () == 4 &&
(args[0] == "from" || args[0] == "since") &&
args[0] == "from" &&
args[1] == "<date>" &&
args[2] == "for" &&
args[3] == "<duration>")
@ -192,6 +192,15 @@ Interval getFilter (const CLI& cli)
range.end = Datetime ();
}
// for <duration>
else if (args.size () == 2 &&
args[0] == "for" &&
args[1] == "<duration>")
{
range.start = Datetime () - Duration (duration).toTime_t ();
range.end = Datetime ();
}
// <duration>
else if (args.size () == 1 &&
args[0] == "<duration>")