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

Fix getTracked() when last interval is empty

Browse source
This commit is contained in:
Janik Rabe 2018-08-26 11:50:35 +02:00 • committed by Thomas Lauf
parent 4e08bcca4d
commit fef522c53d
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/data.cpp
View file

@ -595,9 +595,9 @@ std::vector <Interval> getTracked (
auto inclusions = getAllInclusions (database);
// Exclusions are only usable within a range, so if no filter range exists,
// determine the outermost range of the inclusions, ie:
// determine the infinite range starting at the first inclusion, i.e.:
//
// [earliest start, latest end)
// [earliest start, infinity)
//
// Avoid assigning a zero-width range - leave it unstarted instead.
if (! filter.range.is_started ())
@ -606,12 +606,10 @@ std::vector <Interval> getTracked (
if (outer.total ())
filter.range = outer;
if (! inclusions.empty ()) {
auto latest = inclusions.back();
if (latest.range.is_open()) {
filter.range.end = 0;
}
}
// Use an infinite range instead of the last end date; this prevents
// issues when there is an empty range [q, q) at the end of a filter
// [p, q), in which case there is no overlap or intersection.
filter.range.end = 0;
}
std::vector <Interval> intervals = inclusions;

10
test/ids.t
View file

@ -48,6 +48,16 @@ class TestIds(TestCase):
self.assertIn(' @1 ', out)
self.assertIn(' @2 ', out)
def test_latest_interval_included_when_empty(self):
"""Count IDs when the last interval is empty
Include the last interval in getTracked() even if it is a
zero-width interval and there are other, earlier intervals.
"""
self.t("track 2018-01-01 - 2018-01-01")
self.t("track 2018-01-02 - 2018-01-02")
code, out, err = self.t("move @2 2018-01-03")
self.assertIn('Moved @2 to 2018-01-03T00:00:00', out)
def test_should_fail_on_zero_id(self):
code, out, err = self.t.runError("delete @0")
self.assertIn("'@0' is not a valid ID.", err)