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

Enhancement

Browse source 
- Re-enabled the onProjectChange function, and upgraded it to TDB2.
  Now it does a lot less, which is another way of saying it is faster.
This commit is contained in:
Paul Beckingham 2011-09-09 00:13:08 -04:00
parent c54bb8a42a
commit d37e46cc48
3 changed files with 15 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/CmdAdd.cpp
View file

@ -60,7 +60,7 @@ int CmdAdd::execute (std::string& output)
if (context.verbose ("new-id"))
output = format (STRING_CMD_ADD_FEEDBACK, context.tdb2.next_id ()) + "\n";
// TODO context.footnote (onProjectChange (task));
context.footnote (onProjectChange (task));
context.tdb2.commit ();
return rc;

4
src/commands/CmdLog.cpp
View file

@ -66,9 +66,7 @@ int CmdLog::execute (std::string& output)
context.tdb2.add (task);
/*
TODO context.footnote (onProjectChange (task));
*/
context.footnote (onProjectChange (task));
context.tdb2.commit ();
if (context.config.getBoolean ("echo.command"))

47
src/helpers.cpp
View file

@ -47,7 +47,7 @@
#include <util.h>
#include <main.h>
static void countTasks (const std::vector <Task>&, const std::string&, const std::vector <Task>&, int&, int&);
static void countTasks (const std::vector <Task>&, const std::string&, int&, int&);
extern Context context;
@ -134,13 +134,8 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
int count_pending = 0;
int count_done = 0;
std::vector <Task> all;
std::vector <Task> none;
// TODO Fix.
// context.tdb.load (all);
//
// countTasks (all, project, context.tdb.getAllModified (), count_pending, count_done);
// countTasks (context.tdb.getAllModified (), project, none, count_pending, count_done);
std::vector <Task> all = context.tdb2.all_tasks ();
countTasks (all, project, count_pending, count_done);
// count_done count_pending percentage
// ---------- ------------- ----------
@ -183,43 +178,27 @@ std::string onProjectChange (Task& task1, Task& task2)
static void countTasks (
const std::vector <Task>& all,
const std::string& project,
const std::vector <Task>& skipTasks,
int& count_pending,
int& count_done)
{
std::vector <Task>::const_iterator it;
for (it = all.begin (); it != all.end (); ++it)
{
bool skip = 0;
if (it->get ("project") == project)
{
std::vector <Task>::const_iterator itSkipTasks;
for (itSkipTasks = skipTasks.begin (); itSkipTasks != skipTasks.end (); ++itSkipTasks)
switch (it->getStatus ())
{
if (it->get("uuid") == itSkipTasks->get("uuid"))
{
skip = 1;
break;
}
}
case Task::pending:
case Task::waiting:
++count_pending;
break;
if (skip == 0)
{
switch (it->getStatus ())
{
case Task::pending:
case Task::waiting:
++count_pending;
break;
case Task::completed:
++count_done;
break;
case Task::completed:
++count_done;
break;
default:
break;
}
default:
break;
}
}
}