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

helper: Added Rules to createTimelineFromData

Browse source
This commit is contained in:
Paul Beckingham 2016-04-27 18:04:36 -04:00
parent 500fa9784a
commit 9c91cb599b
6 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/helper.cpp
View file

@ -297,6 +297,7 @@ Interval createFilterIntervalFromCLI (const CLI& cli)
// We really only need to eliminate A and F.
//
Timeline createTimelineFromData (
const Rules& rules,
Database& database,
const Interval& filter)
{
@ -306,22 +307,27 @@ Timeline createTimelineFromData (
// Add filtered intervals.
for (auto& line : database.allLines ())
{
if (line[0] == 'i')
{
Interval i;
i.initialize (line);
Interval i;
i.initialize (line);
if (intervalMatchesFilterInterval (i, filter))
t.include (i);
}
if (intervalMatchesFilterInterval (i, filter))
t.include (i);
}
else if (line[0] == 'e')
{
// Exclusions are not filtered, so they all match. This makes sure that
// the correct exclusions are lined up ahead of the intervals.
Exclusion e;
e.initialize (line);
t.exclude (e);
}
// Add exclusions from configuration.
for (auto& name : rules.all ("exclusions."))
{
name = lowerCase (name);
/*
std::string line = "exc ";
if (name.substr (0, 16) == "exclusions.days.")
line += "day " + rules.get (name) + " " + name.substr (16);
else
line += name.substr (11) + " " + rules.get (name);
// TODO Convert Exclusion::initialize to parse the line directly out of the
// rules.
*/
t.exclude (Exclusion (name, rules.get (name)));
}
return t;