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

Commands - done

Browse source 
- Converted the 'done' command to TDB2.  This has a negative impact
  on unit tests, but that represents bugs and ommissions in TDB2,
  not flaws in the 'done' command.
This commit is contained in:
Paul Beckingham 2011-09-03 11:14:59 -04:00
parent e7a255ca16
commit 2886151e64
1 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/commands/CmdDone.cpp
View file

@ -54,14 +54,9 @@ int CmdDone::execute (std::string& output)
int count = 0;
std::stringstream out;
std::vector <Task> tasks;
context.tdb.lock (context.config.getBoolean ("locking"));
context.tdb.loadPending (tasks);
// Apply filter.
std::vector <Task> filtered;
filter (tasks, filtered);
filter (filtered);
if (filtered.size () == 0)
{
context.footnote (STRING_FEEDBACK_NO_TASKS_SP);
@ -83,11 +78,7 @@ int CmdDone::execute (std::string& output)
task->getStatus () == Task::waiting)
{
Task before (*task);
modify_task_annotate (*task, modifications);
apply_defaults (*task);
task->setEnd ();
task->setStatus (Task::completed);
// Stop the task, if started.
@ -95,14 +86,11 @@ int CmdDone::execute (std::string& output)
context.config.getBoolean ("journal.time"))
task->addAnnotation (context.config.get ("journal.time.stop.annotation"));
// Only allow valid tasks.
task->validate ();
if (taskDiff (before, *task))
{
if (permission.confirmed (before, taskDifferences (before, *task) + STRING_CMD_DONE_PROCEED))
{
context.tdb.update (*task);
context.tdb2.modify (*task);
++count;
if (context.config.getBoolean ("echo.command"))
@ -127,10 +115,7 @@ int CmdDone::execute (std::string& output)
}
}
if (count)
context.tdb.commit ();
context.tdb.unlock ();
context.tdb2.commit ();
if (context.config.getBoolean ("echo.command"))
out << format ((count == 1