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

TW-1704: Task: Use Task::identifier to reference the task

Browse Source 
To achieve consistent output, use a helper method to generate a proper
handle - ID for tasks with non-zero ID, UUID otherwise.
This commit is contained in:
Tomas Babej
2015-10-30 00:37:20 +01:00
committed by Paul Beckingham
parent 1236abc7d5
commit 2d25cf6f59
16 changed files with 50 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/feedback.cpp
View File

@@ -309,12 +309,10 @@ void feedback_affected (const std::string& effect, const Task& task)
{
if (context.verbose ("affected"))
{
if (task.id)
std::cout << format (effect, task.id, task.get ("description"))
<< "\n";
else
std::cout << format (effect, task.get ("uuid"), task.get ("description"))
<< "\n";
std::cout << format (effect,
task.identifier (true),
task.get ("description"))
<< "\n";
}
}
@@ -373,12 +371,8 @@ void feedback_special_tags (const Task& task, const std::string& tag)
if (msg.length ())
{
if (task.id)
std::cout << format (msg, task.id)
<< "\n";
else
std::cout << format (msg, task.get ("uuid"))
<< "\n";
std::cout << format (msg, task.identifier ())
<< "\n";
}
}
}
@@ -506,7 +500,9 @@ std::string onExpiration (Task& task)
std::stringstream msg;
if (context.verbose ("affected"))
msg << format (STRING_FEEDBACK_EXPIRED, task.id, task.get ("description"));
msg << format (STRING_FEEDBACK_EXPIRED,
task.identifier (true),
task.get ("description"));
return msg.str ();
}