GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-07 21:07:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ColDepends: Support dependency removal for the same formats as dependency addition

Browse source
This commit is contained in:
Tomas Babej 2022-01-19 19:54:15 -05:00
parent 0cc2de6179
commit 112ac54a57
1 changed files with 45 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/columns/ColDepends.cpp
View file

@ -154,15 +154,13 @@ void ColumnDepends::modify (Task& task, const std::string& value)
// Apply or remove dendencies in turn. // Apply or remove dendencies in turn.
for (auto& dep : split (value, ',')) for (auto& dep : split (value, ','))
{ {
bool removal = false;
if (dep[0] == '-') if (dep[0] == '-')
{ {
if (dep.length () == 37) removal = true;
task.removeDependency (dep.substr (1)); dep = dep.substr(1);
else
task.removeDependency (strtol (dep.substr (1).c_str (), nullptr, 10));
} }
else
{
auto hyphen = dep.find ('-'); auto hyphen = dep.find ('-');
long lower, upper; // For ID ranges long lower, upper; // For ID ranges
std::regex valid_uuid ("[a-f0-9]{8}([a-f0-9-]{4,28})?"); // TODO: Make more precise std::regex valid_uuid ("[a-f0-9]{8}([a-f0-9-]{4,28})?"); // TODO: Make more precise
@ -172,6 +170,9 @@ void ColumnDepends::modify (Task& task, const std::string& value)
{ {
// Full UUID, can be added directly // Full UUID, can be added directly
if (dep.length () == 36) if (dep.length () == 36)
if (removal)
task.removeDependency (dep);
else
task.addDependency (dep); task.addDependency (dep);
// Short UUID, need to look up full form // Short UUID, need to look up full form
@ -179,6 +180,9 @@ void ColumnDepends::modify (Task& task, const std::string& value)
{ {
Task loaded_task; Task loaded_task;
if (Context::getContext ().tdb2.get (dep, loaded_task)) if (Context::getContext ().tdb2.get (dep, loaded_task))
if (removal)
task.removeDependency (loaded_task.get ("uuid"));
else
task.addDependency (loaded_task.get ("uuid")); task.addDependency (loaded_task.get ("uuid"));
else else
throw format ("Dependency could not be set - task with UUID '{1}' does not exist.", dep); throw format ("Dependency could not be set - task with UUID '{1}' does not exist.", dep);
@ -190,15 +194,20 @@ void ColumnDepends::modify (Task& task, const std::string& value)
extractLongInteger (dep.substr (hyphen + 1), upper)) extractLongInteger (dep.substr (hyphen + 1), upper))
{ {
for (long i = lower; i <= upper; i++) for (long i = lower; i <= upper; i++)
task.addDependency(i); if (removal)
task.removeDependency (i);
else
task.addDependency (i);
} }
// Simple ID // Simple ID
else if (extractLongInteger (dep, lower)) else if (extractLongInteger (dep, lower))
if (removal)
task.removeDependency (lower);
else
task.addDependency (lower); task.addDependency (lower);
else else
throw format ("Invalid dependency value: '{1}'", dep); throw format ("Invalid dependency value: '{1}'", dep);
} }
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////