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: Renamed createFilterIntervalFromCLI to getFilter

Browse source
This commit is contained in:
Paul Beckingham 2016-04-28 08:48:37 -04:00
parent ae0ba6ffa1
commit 34c0cc81e7
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/CmdExport.cpp
View file

@ -35,7 +35,7 @@ int CmdExport (
Rules& rules,
Database& database)
{
auto filter = createFilterIntervalFromCLI (cli);
auto filter = getFilter (cli);
auto timeline = createTimelineFromData (rules, database, filter);
std::cout << jsonFromIntervals (timeline.tracked (rules));
return 0;

2
src/commands/CmdGaps.cpp
View file

@ -35,7 +35,7 @@ int CmdGaps (
Rules& rules,
Database& database)
{
auto filter = createFilterIntervalFromCLI (cli);
auto filter = getFilter (cli);
auto timeline = createTimelineFromData (rules, database, filter);
for (auto& gap : timeline.untracked (rules))
{

2
src/commands/CmdReport.cpp
View file

@ -79,7 +79,7 @@ int CmdReport (
throw std::string ("Specify which report to run.");
// Filter the data.
auto filter = createFilterIntervalFromCLI (cli);
auto filter = getFilter (cli);
auto timeline = createTimelineFromData (rules, database, filter);
auto intervals = timeline.tracked (rules);

2
src/commands/CmdReportDay.cpp
View file

@ -47,7 +47,7 @@ int CmdReportDay (
Database& database)
{
// Create a filter, and if empty, choose 'today'.
auto filter = createFilterIntervalFromCLI (cli);
auto filter = getFilter (cli);
if (! filter.range.started ())
filter.range = Range (Datetime ("today"), Datetime ("tomorrow"));

2
src/commands/CmdReportSummary.cpp
View file

@ -35,7 +35,7 @@ int CmdReportSummary (
Rules& rules,
Database& database)
{
auto filter = createFilterIntervalFromCLI (cli);
auto filter = getFilter (cli);
// If filter is empty, choose 'today'.
if (! filter.range.started ())

2
src/commands/CmdTrack.cpp
View file

@ -35,7 +35,7 @@ int CmdTrack (
Rules& rules,
Database& database)
{
auto filter = createFilterIntervalFromCLI (cli);
auto filter = getFilter (cli);
auto timeline = createTimelineFromData (rules, database, filter);
for (auto& interval : splitInterval (filter, timeline.excluded (rules)))
database.addInterval (interval);

2
src/helper.cpp
View file

@ -124,7 +124,7 @@ bool expandIntervalHint (
// ["from"] <date> "for" <duration>
// <duration> ["before"|"after" <date>]
//
Interval createFilterIntervalFromCLI (const CLI& cli)
Interval getFilter (const CLI& cli)
{
Interval filter;
std::string start;

2
src/timew.h
View file

@ -47,8 +47,8 @@ int dispatchCommand (const CLI&, Database&, Rules&, const Extensions&);
Color tagColor (const Rules&, const std::string&);
std::string intervalSummarize (const Rules&, const Interval&);
bool expandIntervalHint (const std::string&, std::string&, std::string&);
Interval createFilterIntervalFromCLI (const CLI&);
Timeline createTimelineFromData (const Rules&, Database&, const Interval&);
Interval getFilter (const CLI&);
Interval getLatestInterval (Database&);
bool intervalMatchesFilterInterval (const Interval&, const Interval&);
std::string jsonFromIntervals (const std::vector <Interval>&);