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

Confirmation

Browse source 
- Implemented consistent confirmation.
This commit is contained in:
Paul Beckingham 2011-10-14 02:23:22 -04:00
parent 1b54516b45
commit 02e7c4f3ce
4 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/commands/CmdDenotate.cpp
View file

@ -27,9 +27,8 @@
#define L10N // Localization complete.
#include <sstream>
#include <iostream>
#include <Context.h>
#include <Permission.h>
#include <text.h>
#include <util.h>
#include <i18n.h>
@ -53,7 +52,6 @@ int CmdDenotate::execute (std::string& output)
{
int rc = 0;
int count = 0;
std::stringstream out;
bool sensitive = context.config.getBoolean ("search.case.sensitive");
// Apply filter.
@ -72,10 +70,6 @@ int CmdDenotate::execute (std::string& output)
std::string pattern = words.combine ();
Permission permission;
if (filtered.size () > (size_t) context.config.getInteger ("bulk"))
permission.bigSequence ();
std::vector <Task>::iterator task;
for (task = filtered.begin (); task != filtered.end (); ++task)
{
@ -118,39 +112,26 @@ int CmdDenotate::execute (std::string& output)
if (taskDiff (before, *task))
{
std::string question = format (STRING_CMD_DENO_QUESTION,
std::string question = format (STRING_CMD_DENO_CONFIRM,
task->id,
task->get ("description"));
if (permission.confirmed (*task, taskDifferences (before, *task) + question))
if (permission (*task, taskDifferences (before, *task) + question, filtered.size ()))
{
++count;
context.tdb2.modify (*task);
if (context.verbose ("affected") ||
context.config.getBoolean ("echo.command")) // Deprecated 2.0
out << format (STRING_CMD_DENO_FOUND, anno)
<< "\n";
feedback_affected (format (STRING_CMD_DENO_FOUND, anno));
}
}
else
{
out << format (STRING_CMD_DENO_NOMATCH, pattern)
<< "\n";
std::cout << format (STRING_CMD_DENO_NOMATCH, pattern) << "\n";
rc = 1;
}
}
context.tdb2.commit ();
if (context.verbose ("affected") ||
context.config.getBoolean ("echo.command")) // Deprecated 2.0
out << format ((count == 1
? STRING_CMD_DENO_TASK
: STRING_CMD_DENO_TASKS),
count)
<< "\n";
output = out.str ();
feedback_affected (count == 1 ? STRING_CMD_DENO_1 : STRING_CMD_DENO_N, count);
return rc;
}