gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Filter

Browse Source 
- Improved ::pendingOnly algorithm.
This commit is contained in:
Paul Beckingham
2014-11-10 18:11:13 -05:00
parent ff9b8217e2
commit fd518e3fce
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Filter.cpp
View File

@@ -205,41 +205,48 @@ bool Filter::pendingOnly ()
// - no 'deleted' // - no 'deleted'
// - no 'xor' // - no 'xor'
// - no 'or' // - no 'or'
int countStatus = 0; int countStatus = 0;
int countPending = 0; int countPending = 0;
int countId = 0; int countWaiting = 0;
int countOr = 0; int countRecurring = 0;
int countXor = 0; int countId = 0;
int countOr = 0;
// TODO Use an int index, and ensure that 'status', '==' and 'pending/waiting' int countXor = 0;
// are consecutive. int countNot = 0;
std::vector <A>::iterator a; std::vector <A>::iterator a;
for (a = context.cli._args.begin (); a != context.cli._args.end (); ++a) for (a = context.cli._args.begin (); a != context.cli._args.end (); ++a)
{ {
if (a->hasTag ("FILTER")) if (a->hasTag ("FILTER"))
{ {
if (a->hasTag ("ID")) ++countId; if (a->hasTag ("ID")) ++countId;
if (a->hasTag ("OP") && a->attribute ("raw") == "or") ++countOr; if (a->hasTag ("OP") && a->attribute ("raw") == "or") ++countOr;
if (a->hasTag ("OP") && a->attribute ("raw") == "xor") ++countXor; if (a->hasTag ("OP") && a->attribute ("raw") == "xor") ++countXor;
if (a->hasTag ("ATTRIBUTE") && a->attribute ("name") == "status") ++countStatus; if (a->hasTag ("OP") && a->attribute ("raw") == "not") ++countNot;
if ( a->attribute ("raw") == "pending") ++countPending; if (a->hasTag ("ATTRIBUTE") && a->attribute ("name") == "status") ++countStatus;
if ( a->attribute ("raw") == "pending") ++countPending;
if ( a->attribute ("raw") == "waiting") ++countWaiting;
if ( a->attribute ("raw") == "recurring") ++countRecurring;
} }
} }
// Use of 'or' or 'xor' means the potential for alternation. if (countOr || countXor || countNot)
if (countOr || countXor)
return false; return false;
// If the filter does not contain id or status terms, read both files. if (countStatus)
if (countId == 0 && countStatus == 0) {
return false; if (!countPending && !countWaiting && !countRecurring)
return false;
// Only one 'status == pending' is allowed. return true;
if (countStatus != 1 || countPending != 1) }
return false;
return true; if (countId)
{
return true;
}
return false;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////