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

validate: autoFill checks for the hint

Browse source
This commit is contained in:
Paul Beckingham 2016-07-09 10:32:04 -04:00
parent 0cbf9a0bdd
commit 283e0a5a21
1 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/validate.cpp
View file

@ -38,37 +38,41 @@
// range.
//
static void autoFill (
const CLI& cli,
const Rules& rules,
Database& database,
const Interval& filter,
Interval& interval)
{
// An empty filter allows scanning beyond interval.range.
Interval range_filter;
// Look backwards from interval.range.start to a boundary.
auto tracked = getTracked (database, rules, range_filter);
for (auto earlier = tracked.rbegin (); earlier != tracked.rend (); ++earlier)
if (findHint (cli, ":fill"))
{
if (! earlier->range.is_open () &&
earlier->range.end < interval.range.start)
// An empty filter allows scanning beyond interval.range.
Interval range_filter;
// Look backwards from interval.range.start to a boundary.
auto tracked = getTracked (database, rules, range_filter);
for (auto earlier = tracked.rbegin (); earlier != tracked.rend (); ++earlier)
{
interval.range.start = earlier->range.end;
std::cout << "Backfilled to " << interval.range.start.toISOLocalExtended () << "\n";
break;
if (! earlier->range.is_open () &&
earlier->range.end < interval.range.start)
{
interval.range.start = earlier->range.end;
std::cout << "Backfilled to " << interval.range.start.toISOLocalExtended () << "\n";
break;
}
}
}
// If the interval is closed, scan forwards for the next boundary.
if (! interval.range.is_open ())
{
for (auto& later : tracked)
if (! interval.range.is_open ())
{
if (interval.range.end < later.range.start)
for (auto& later : tracked)
{
interval.range.end = later.range.start;
std::cout << "Filled to " << interval.range.end.toISOLocalExtended () << "\n";
break;
if (interval.range.end < later.range.start)
{
interval.range.end = later.range.start;
std::cout << "Filled to " << interval.range.end.toISOLocalExtended () << "\n";
break;
}
}
}
}
@ -129,8 +133,7 @@ void validate (
if (! filter.range.is_started ())
filter.range = Range (Datetime ("today"), Datetime ("tomorrow"));
if (findHint (cli, ":fill"))
autoFill (rules, database, filter, interval);
autoFill (cli, rules, database, filter, interval);
if (findHint (cli, ":adjust"))
autoAdjust (rules, database, filter, interval);