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

Filter: Corrected implementation of ::safety

Browse source
This commit is contained in:
Paul Beckingham 2015-06-27 21:08:24 -04:00
parent e0291d35e4
commit 358223a6b1
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Filter.cpp
View file

@ -182,7 +182,7 @@ void Filter::subset (std::vector <Task>& output, bool applyContext /* = true */)
} }
else else
{ {
safety (precompiled.size ()); safety ();
context.timer_filter.stop (); context.timer_filter.stop ();
for (auto& task : context.tdb2.pending.get_tasks ()) for (auto& task : context.tdb2.pending.get_tasks ())
@ -261,7 +261,7 @@ bool Filter::pendingOnly ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Disaster avoidance mechanism. If a WRITECMD has no filter, then it can cause // Disaster avoidance mechanism. If a WRITECMD has no filter, then it can cause
// all tasks to be modified. This is usually not intended. // all tasks to be modified. This is usually not intended.
void Filter::safety (unsigned int terms) void Filter::safety ()
{ {
for (auto& a : context.cli2._args) for (auto& a : context.cli2._args)
{ {
@ -269,19 +269,16 @@ void Filter::safety (unsigned int terms)
{ {
if (a.hasTag ("WRITECMD")) if (a.hasTag ("WRITECMD"))
{ {
if (terms) if (! context.config.getBoolean ("allow.empty.filter"))
{ throw std::string (STRING_TASK_SAFETY_ALLOW);
if (! context.config.getBoolean ("allow.empty.filter"))
throw std::string (STRING_TASK_SAFETY_ALLOW);
// If user is willing to be asked, this can be avoided. // If user is willing to be asked, this can be avoided.
if (context.config.getBoolean ("confirmation") && if (context.config.getBoolean ("confirmation") &&
confirm (STRING_TASK_SAFETY_VALVE)) confirm (STRING_TASK_SAFETY_VALVE))
return; return;
// Sounds the alarm. // Sounds the alarm.
throw std::string (STRING_TASK_SAFETY_FAIL); throw std::string (STRING_TASK_SAFETY_FAIL);
}
} }
// CMD was found. // CMD was found.

2
src/Filter.h
View file

@ -43,7 +43,7 @@ public:
void subset (const std::vector <Task>&, std::vector <Task>&, bool applyContext = true); void subset (const std::vector <Task>&, std::vector <Task>&, bool applyContext = true);
void subset (std::vector <Task>&, bool applyContext = true); void subset (std::vector <Task>&, bool applyContext = true);
bool pendingOnly (); bool pendingOnly ();
void safety (unsigned int); void safety ();
private: private:
int _startCount; int _startCount;