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

Filter

Browse source 
- Fixed ::pendingOnly, which now has a clearly-defined set of rules.
This commit is contained in:
Paul Beckingham 2014-05-30 00:39:38 -04:00
parent da95c16da9
commit 688dcb6cd3
1 changed files with 27 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/Filter.cpp
View file

@ -208,44 +208,41 @@ bool Filter::pendingOnly ()
{
Tree* tree = context.parser.tree ();
// If the filter starts with "status:pending", the completed.data does not
// need to be accessed..
if (tree->_branches.size () > 0 &&
tree->_branches[0]->attribute ("name") == "status" &&
tree->_branches[0]->attribute ("value") == "pending")
{
context.debug ("Filter::pendingOnly - skipping completed.data (status:pending first)");
return true;
}
// Shortcut: If the filter contains no 'or' or 'xor' operators, IDs and no UUIDs.
// To skip loading completed.data, there should be:
// - 'status:pending'
// - no 'or' operators
// - no 'xor' operators
int countStatus = 0;
int countPending = 0;
int countId = 0;
int countUUID = 0;
int countOr = 0;
int countXor = 0;
std::vector <Tree*>::iterator i;
for (i = tree->_branches.begin (); i != tree->_branches.end (); ++i)
{
if ((*i)->hasTag ("OP"))
if ((*i)->hasTag ("FILTER"))
{
if ((*i)->attribute ("canonical") == "or") ++countOr;
if ((*i)->attribute ("canonical") == "xor") ++countXor;
if ((*i)->hasTag ("ID")) ++countId;
if ((*i)->hasTag ("OP") && (*i)->attribute ("raw") == "or") ++countOr;
if ((*i)->hasTag ("OP") && (*i)->attribute ("raw") == "xor") ++countXor;
if ((*i)->hasTag ("ATTRIBUTE") && (*i)->attribute ("name") == "status") ++countStatus;
if ((*i)->hasTag ("ATTRIBUTE") && (*i)->attribute ("raw") == "pending") ++countPending;
}
else if ((*i)->hasTag ("ID")) ++countId;
else if ((*i)->hasTag ("UUID")) ++countUUID;
}
if (countOr == 0 &&
countXor == 0 &&
countUUID == 0 &&
countId > 0)
{
context.debug ("Filter::pendingOnly - skipping completed.data (IDs, no OR, no XOR, no UUID)");
return true;
}
// Use of 'or' or 'xor' means the potential for alternation.
if (countOr || countXor)
return false;
// If the filter does not contain id or status terms, read both files.
if (countId == 0 && countStatus == 0)
return false;
// Only one 'status == pending' is allowed.
if (countStatus == 1 && countPending != 1)
return false;
return true;
}
////////////////////////////////////////////////////////////////////////////////