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

TDB2

Browse source 
- Consolidated most of the processing in ::add and ::modify into ::update.
This commit is contained in:
Paul Beckingham 2014-09-14 15:25:37 -04:00
parent 21be0e3e94
commit 7b617a7b6e
2 changed files with 28 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/TDB2.cpp
View file

@ -574,6 +574,33 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
// TODO call hooks.
// context.hooks.onAdd (changes);
update (uuid, task, add_to_backlog, changes);
}
////////////////////////////////////////////////////////////////////////////////
void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
{
// Ensure the task is consistent, and provide defaults if necessary.
task.validate (false);
std::string uuid = task.get ("uuid");
// Create a vector tasks, as hooks can cause them to multiply.
std::vector <Task> changes;
changes.push_back (task);
// TODO call hooks.
// context.hooks.onModify (changes);
update (uuid, task, add_to_backlog, changes);
}
////////////////////////////////////////////////////////////////////////////////
void TDB2::update (
const std::string& uuid,
Task& task,
const bool add_to_backlog,
std::vector <Task>& changes)
{
std::vector <Task>::iterator i;
for (i = changes.begin (); i != changes.end (); ++i)
{
@ -623,55 +650,6 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
}
}
////////////////////////////////////////////////////////////////////////////////
void TDB2::modify (Task& task, bool add_to_backlog /* = true */)
{
// Ensure the task is consistent, and provide defaults if necessary.
task.validate (false);
std::string uuid = task.get ("uuid");
// Create a vector tasks, as hooks can cause them to multiply.
std::vector <Task> toModify;
toModify.push_back (task);
// TODO call hooks.
// context.hooks.onModify (toModify);
std::vector <Task>::iterator i;
for (i = toModify.begin (); i != toModify.end (); ++i)
{
// Find task, overwrite it.
Task original;
get (task.get ("uuid"), original);
if (taskDiff (original, task))
{
// TODO Upgrade to add or modify, not just add.
// Update the task, wherever it is.
if (!pending.modify_task (task))
completed.modify_task (task);
// time <time>
// old <task>
// new <task>
// ---
undo.add_line ("time " + Date ().toEpochString () + "\n");
undo.add_line ("old " + original.composeF4 () + "\n");
undo.add_line ("new " + task.composeF4 () + "\n");
undo.add_line ("---\n");
// Add modified task to backlog.
if (add_to_backlog)
backlog.add_line (task.composeJSON () + "\n");
// The original task may be further referenced by the caller.
if (i->get ("uuid") == uuid)
task = *i;
}
}
}
////////////////////////////////////////////////////////////////////////////////
void TDB2::commit ()
{

1
src/TDB2.h
View file

@ -126,6 +126,7 @@ public:
void dump ();
private:
void update (const std::string&, Task&, const bool, std::vector <Task>&);
bool verifyUniqueUUID (const std::string&);
void show_diff (const std::string&, const std::string&, const std::string&);
void revert_undo (std::vector <std::string>&, std::string&, std::string&, std::string&, std::string&);