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

data: Added '3h ago' as a filter

Browse source
This commit is contained in:
Paul Beckingham 2016-04-29 00:06:04 -04:00
parent 09f3f56544
commit b64b503d99
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/data.cpp
View file

@ -40,6 +40,7 @@
// ["from"] <date> ["to"|"-" <date>]
// ["from"] <date> "for" <duration>
// <duration> ["before"|"after" <date>]
// <duration> "ago"
//
Interval getFilter (const CLI& cli)
{
@ -106,7 +107,7 @@ Interval getFilter (const CLI& cli)
args[0] == "<date>")
{
range.start = Datetime (start);
range.end = Datetime ("now");
range.end = Datetime ();
}
// from <date>
@ -115,7 +116,7 @@ Interval getFilter (const CLI& cli)
args[1] == "<date>")
{
range.start = Datetime (start);
range.end = Datetime ("now");
range.end = Datetime ();
}
// <date> to/- <date>
@ -161,7 +162,7 @@ Interval getFilter (const CLI& cli)
}
// <duration> before <date>
else if (args.size () == 3 &&
else if (args.size () == 3 &&
args[0] == "<duration>" &&
args[1] == "before" &&
args[2] == "<date>")
@ -171,7 +172,7 @@ Interval getFilter (const CLI& cli)
}
// <duration> after <date>
else if (args.size () == 3 &&
else if (args.size () == 3 &&
args[0] == "<duration>" &&
args[1] == "after" &&
args[2] == "<date>")
@ -180,12 +181,21 @@ Interval getFilter (const CLI& cli)
range.end = Datetime (start) + Duration (duration).toTime_t ();
}
// <duration> ago
else if (args.size () == 2 &&
args[0] == "<duration>" &&
args[1] == "ago")
{
range.start = Datetime () - Duration (duration).toTime_t ();
range.end = Datetime ();
}
// <duration>
else if (args.size () == 1 &&
args[0] == "<duration>")
{
range.start = Datetime ("now") - Duration (duration).toTime_t ();
range.end = Datetime ("now");
range.start = Datetime () - Duration (duration).toTime_t ();
range.end = Datetime ();
}
// Unrecognized date range construct.