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

data: Corrected implementation of getUntracked

Browse source
This commit is contained in:
Paul Beckingham 2016-05-13 23:03:16 -04:00
parent 2f32f96f7f
commit 5d21c9e11b
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/data.cpp
View file

@ -614,22 +614,12 @@ std::vector <Range> getUntracked (
const Rules& rules, const Rules& rules,
Interval& filter) Interval& filter)
{ {
std::vector <Range> available {filter.range};
available = subtractRanges (available, getAllExclusions (rules, filter.range));
std::vector <Range> inclusion_ranges; std::vector <Range> inclusion_ranges;
for (auto& i : getAllInclusions (database)) for (auto& i : getAllInclusions (database))
inclusion_ranges.push_back (i.range); inclusion_ranges.push_back (i.range);
available = subtractRanges (available, inclusion_ranges); auto available = subtractRanges ({filter.range}, getAllExclusions (rules, filter.range));
return subtractRanges (available, inclusion_ranges);
/*
std::cout << "# After subtracting exclusions, inclusions:\n";
for (auto& a : available)
std::cout << "# " << a.dump () << "\n";
*/
return available;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////