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

rules: Reduce code duplication

Browse Source
This commit is contained in:
Tomas Babej
2020-12-14 21:46:52 -05:00
parent 2336c4039d
commit e37ab8a9ed
1 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/rules.cpp
View File

@@ -224,42 +224,22 @@ static void colorizeUDA (Task& task, const std::string& rule, const Color& base,
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void colorizeDue (Task& task, const Color& base, Color& c, bool merge) static void colorizeDue (Task& task, const Color& base, Color& c, bool merge)
{ {
if (task.has ("due")) if (task.is_due ())
{ applyColor (base, c, merge);
auto status = task.getStatus ();
if (status != Task::completed &&
status != Task::deleted &&
task.getDateState ("due") == Task::dateAfterToday)
applyColor (base, c, merge);
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void colorizeDueToday (Task& task, const Color& base, Color& c, bool merge) static void colorizeDueToday (Task& task, const Color& base, Color& c, bool merge)
{ {
if (task.has ("due")) if (task.is_duetoday ())
{ applyColor (base, c, merge);
auto status = task.getStatus ();
auto dateState = task.getDateState ("due");
if (status != Task::completed &&
status != Task::deleted &&
(dateState == Task::dateLaterToday || dateState == Task::dateEarlierToday))
applyColor (base, c, merge);
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void colorizeOverdue (Task& task, const Color& base, Color& c, bool merge) static void colorizeOverdue (Task& task, const Color& base, Color& c, bool merge)
{ {
if (task.has ("due")) if (task.is_overdue ())
{ applyColor (base, c, merge);
auto status = task.getStatus ();
auto dateState = task.getDateState ("due");
if (status != Task::completed &&
status != Task::deleted &&
(dateState == Task::dateBeforeToday || dateState == Task::dateEarlierToday))
applyColor (base, c, merge);
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////