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

CmdContinue: Do not load entire database

Browse source 
This change eliminates the call to getTracked with an empty filter,
which causes the entire database to be parsed.

Related to issue #245
This commit is contained in:
Shaun Ruffell 2020-01-05 17:21:49 -06:00 • committed by lauft
parent 59ee7e47d4
commit 2c1a4a146d
1 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/commands/CmdContinue.cpp
View file

@ -28,6 +28,7 @@
#include <format.h> #include <format.h>
#include <timew.h> #include <timew.h>
#include <iostream> #include <iostream>
#include <cassert>
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdContinue ( int CmdContinue (
@ -36,28 +37,29 @@ int CmdContinue (
Database& database, Database& database,
Journal& journal) Journal& journal)
{ {
const bool verbose = rules.getBoolean ("verbose");
// Gather IDs and TAGs. // Gather IDs and TAGs.
std::set <int> ids = cli.getIds(); std::set <int> ids = cli.getIds();
if (ids.size() > 1) if (ids.size() > 1)
throw std::string ("You can only specify one ID to continue."); throw std::string ("You can only specify one ID to continue.");
journal.startTransaction ();
flattenDatabase (database, rules);
Interval to_copy; Interval to_copy;
Interval latest = getLatestInterval (database); Interval latest = getLatestInterval (database);
if (ids.size() == 1) if (ids.size() == 1)
{ {
// Load the data. auto intervals = getIntervalsByIds (database, rules, ids);
// Note: There is no filter.
Interval filter;
auto tracked = getTracked (database, rules, filter);
auto id = *ids.begin (); if (intervals.size () == 0)
throw format ("ID '@{1}' does not correspond to any tracking.", *ids.begin ());
if (id > static_cast <int> (tracked.size ())) assert (intervals.size () == 1);
throw format ("ID '@{1}' does not correspond to any tracking.", id); to_copy = intervals.front ();
to_copy = tracked[tracked.size () - id];
} }
else else
{ {
@ -74,8 +76,6 @@ int CmdContinue (
Datetime start_time; Datetime start_time;
Datetime end_time; Datetime end_time;
journal.startTransaction ();
if (filter.start.toEpoch () != 0) if (filter.start.toEpoch () != 0)
{ {
start_time = filter.start; start_time = filter.start;
@ -87,35 +87,25 @@ int CmdContinue (
end_time = 0; end_time = 0;
} }
if (latest.is_open ())
{
auto exclusions = getAllExclusions (rules, filter);
// Stop it, at the given start time, if applicable.
Interval modified {latest};
modified.end = start_time;
// Update database.
database.deleteInterval (latest);
for (auto& interval : flatten (modified, exclusions))
{
database.addInterval (interval, rules.getBoolean ("verbose"));
if (rules.getBoolean ("verbose"))
std::cout << '\n' << intervalSummarize (database, rules, interval);
}
}
// Create an identical interval and update the DB. // Create an identical interval and update the DB.
to_copy.start = start_time; to_copy.start = start_time;
to_copy.end = end_time; to_copy.end = end_time;
if (latest.is_open ())
{
Interval modified {latest};
modified.end = start_time;
database.modifyInterval(latest, modified, verbose);
if (verbose)
std::cout << '\n' << intervalSummarize (database, rules, modified);
}
validate (cli, rules, database, to_copy); validate (cli, rules, database, to_copy);
database.addInterval (to_copy, rules.getBoolean ("verbose")); database.addInterval (to_copy, verbose);
journal.endTransaction (); journal.endTransaction ();
if (rules.getBoolean ("verbose")) if (verbose)
std::cout << intervalSummarize (database, rules, to_copy); std::cout << intervalSummarize (database, rules, to_copy);
return 0; return 0;