mirror of
https://github.com/GothenburgBitFactory/timewarrior.git
synced 2025-07-07 20:06:39 +02:00
parent
2c1a4a146d
commit
16d2c13f55
1 changed files with 18 additions and 41 deletions
|
@ -25,6 +25,7 @@
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include <cmake.h>
|
#include <cmake.h>
|
||||||
|
#include <cassert>
|
||||||
#include <commands.h>
|
#include <commands.h>
|
||||||
#include <format.h>
|
#include <format.h>
|
||||||
#include <timew.h>
|
#include <timew.h>
|
||||||
|
@ -39,6 +40,7 @@ int CmdTag (
|
||||||
Journal& journal)
|
Journal& journal)
|
||||||
{
|
{
|
||||||
// Gather IDs and TAGs.
|
// Gather IDs and TAGs.
|
||||||
|
const bool verbose = rules.getBoolean ("verbose");
|
||||||
std::set <int> ids = cli.getIds ();
|
std::set <int> ids = cli.getIds ();
|
||||||
std::vector<std::string> tags = cli.getTags ();
|
std::vector<std::string> tags = cli.getTags ();
|
||||||
|
|
||||||
|
@ -47,68 +49,43 @@ int CmdTag (
|
||||||
throw std::string ("At least one tag must be specified. See 'timew help tag'.");
|
throw std::string ("At least one tag must be specified. See 'timew help tag'.");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load the data.
|
|
||||||
// Note: There is no filter.
|
|
||||||
Interval filter;
|
|
||||||
auto tracked = getTracked (database, rules, filter);
|
|
||||||
|
|
||||||
bool dirty = true;
|
|
||||||
|
|
||||||
journal.startTransaction ();
|
journal.startTransaction ();
|
||||||
|
|
||||||
for (auto& id : ids)
|
flattenDatabase (database, rules);
|
||||||
|
auto intervals = getIntervalsByIds (database, rules, ids);
|
||||||
|
|
||||||
|
if (intervals.empty ())
|
||||||
{
|
{
|
||||||
if (id > static_cast <int> (tracked.size ()))
|
if (database.empty ())
|
||||||
throw format ("ID '@{1}' does not correspond to any tracking.", id);
|
|
||||||
|
|
||||||
if (tracked[tracked.size() - id].synthetic && dirty)
|
|
||||||
{
|
|
||||||
auto latest = getLatestInterval(database);
|
|
||||||
auto exclusions = getAllExclusions (rules, filter);
|
|
||||||
|
|
||||||
Interval modified {latest};
|
|
||||||
|
|
||||||
// Update database.
|
|
||||||
database.deleteInterval (latest);
|
|
||||||
for (auto& interval : flatten (modified, exclusions))
|
|
||||||
database.addInterval (interval, rules.getBoolean ("verbose"));
|
|
||||||
|
|
||||||
dirty = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ids.empty ())
|
|
||||||
{
|
|
||||||
if (tracked.empty ())
|
|
||||||
{
|
{
|
||||||
throw std::string ("There is no active time tracking.");
|
throw std::string ("There is no active time tracking.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tracked.back ().is_open ())
|
auto latest = getLatestInterval (database);
|
||||||
|
|
||||||
|
if (!latest.is_open ())
|
||||||
{
|
{
|
||||||
throw std::string ("At least one ID must be specified. See 'timew help tag'.");
|
throw std::string ("At least one ID must be specified. See 'timew help tag'.");
|
||||||
}
|
}
|
||||||
|
|
||||||
ids.insert (1);
|
latest.id = 1;
|
||||||
|
intervals.push_back (latest);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply tags to ids.
|
// Apply tags to ids.
|
||||||
for (auto& id : ids)
|
for (const auto& interval : intervals)
|
||||||
{
|
{
|
||||||
if (id > static_cast <int> (tracked.size ()))
|
Interval modified {interval};
|
||||||
throw format ("ID '@{1}' does not correspond to any tracking.", id);
|
|
||||||
|
|
||||||
Interval i = tracked[tracked.size () - id];
|
|
||||||
|
|
||||||
for (auto& tag : tags)
|
for (auto& tag : tags)
|
||||||
i.tag (tag);
|
modified.tag (tag);
|
||||||
|
|
||||||
//TODO validate (cli, rules, database, i);
|
//TODO validate (cli, rules, database, i);
|
||||||
database.modifyInterval (tracked[tracked.size () - id], i, rules.getBoolean ("verbose"));
|
database.modifyInterval (interval, modified, verbose);
|
||||||
|
|
||||||
if (rules.getBoolean ("verbose"))
|
if (verbose)
|
||||||
{
|
{
|
||||||
std::cout << "Added " << joinQuotedIfNeeded (" ", tags) << " to @" << id << '\n';
|
std::cout << "Added " << joinQuotedIfNeeded (" ", tags) << " to @" << interval.id << '\n';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue