GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-08 06:10:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Nag based on task state before modification

Browse source 
With this patch, taskwarrior uses the urgency of tasks before any
modifications are applied when deciding whether to show nag messages.

Previously, taskwarrior would apply modifications before deciding
whether to show nag messages, which could lead to spurious nag messages
when completing an active task.
This commit is contained in:
Korrat 2021-07-22 17:08:00 +02:00 • committed by Tomas Babej
parent 607baa081d
commit b33a99a748
5 changed files with 98 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/nag.cpp
View file

@ -24,41 +24,37 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <algorithm>
#include <cmake.h>
#include <Context.h>
#include <iterator>
#include <unordered_set>
#include <utility>
#include <vector>
////////////////////////////////////////////////////////////////////////////////
// Returns a Boolean indicator as to whether a nag message was generated, so
// that commands can control the number of nag messages displayed (ie one is
// enough).
//
// Otherwise generates a nag message, if one is defined, if there are tasks of
// higher urgency.
bool nag (Task& task)
// Generates a nag message when there are READY tasks of a higher urgency.
void nag (std::vector <Task>& tasks)
{
// Special tag overrides nagging.
if (task.hasTag ("nonag"))
return false;
auto msg = Context::getContext ().config.get ("nag");
if (msg != "")
{
// Scan all pending, non-recurring tasks.
auto pending = Context::getContext ().tdb2.pending.get_tasks ();
for (auto& t : pending)
{
if ((t.getStatus () == Task::pending ||
t.getStatus () == Task::waiting) &&
t.hasTag ("READY") &&
t.urgency () > task.urgency ())
if (msg == "")
return;
auto pending = Context::getContext ().tdb2.pending.get_tasks ();
for (auto& t1 : tasks) {
if (t1.hasTag ("nonag"))
continue;
for (auto& t2 : pending) {
if (t1.get ("uuid") != t2.get ("uuid") &&
t2.hasTag ("READY") &&
t1.urgency () < t2.urgency ())
{
Context::getContext ().footnote (msg);
return true;
return;
}
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////