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

CmdInfo: Code cleanup

Browse source
This commit is contained in:
Paul Beckingham 2017-01-29 12:22:31 -05:00
parent 8f7ec80666
commit 5915d3834d
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/commands/CmdInfo.cpp
View file

@ -66,7 +66,7 @@ CmdInfo::CmdInfo ()
////////////////////////////////////////////////////////////////////////////////
int CmdInfo::execute (std::string& output)
{
int rc = 0;
auto rc = 0;
// Apply filter.
Filter filter;
@ -87,11 +87,11 @@ int CmdInfo::execute (std::string& output)
// Determine the output date format, which uses a hierarchy of definitions.
// rc.dateformat.info
// rc.dateformat
std::string dateformat = context.config.get ("dateformat.info");
auto dateformat = context.config.get ("dateformat.info");
if (dateformat == "")
dateformat = context.config.get ("dateformat");
std::string dateformatanno = context.config.get ("dateformat.annotation");
auto dateformatanno = context.config.get ("dateformat.annotation");
if (dateformatanno == "")
dateformatanno = dateformat;
@ -122,7 +122,7 @@ int CmdInfo::execute (std::string& output)
Datetime now;
// id
int row = view.addRow ();
auto row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_ID);
view.set (row, 1, (task.id ? format (task.id) : "-"));
@ -131,8 +131,8 @@ int CmdInfo::execute (std::string& output)
// description
Color c;
autoColorize (task, c);
std::string description = task.get ("description");
int indent = context.config.getInteger ("indent.annotation");
auto description = task.get ("description");
auto indent = context.config.getInteger ("indent.annotation");
for (auto& anno : task.getAnnotations ())
description += '\n'
@ -227,7 +227,7 @@ int CmdInfo::execute (std::string& output)
std::string entry = dt.toString (dateformat);
std::string age;
std::string created = task.get ("entry");
auto created = task.get ("entry");
if (created.length ())
{
Datetime dt (strtol (created.c_str (), NULL, 10));
@ -350,7 +350,7 @@ int CmdInfo::execute (std::string& output)
// uuid
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_UUID);
std::string uuid = task.get ("uuid");
auto uuid = task.get ("uuid");
view.set (row, 1, uuid);
// Task::urgency
@ -359,7 +359,7 @@ int CmdInfo::execute (std::string& output)
view.set (row, 1, format (task.urgency (), 4, 4));
// Show any UDAs
std::vector <std::string> all = task.all ();
auto all = task.all ();
std::string type;
for (auto& att: all)
{
@ -368,7 +368,7 @@ int CmdInfo::execute (std::string& output)
Column* col = context.columns[att];
if (col->is_uda ())
{
std::string value = task.get (att);
auto value = task.get (att);
if (value != "")
{
row = view.addRow ();
@ -453,7 +453,7 @@ int CmdInfo::execute (std::string& output)
if (var.first.substr (13, 8) == "project." &&
(end = var.first.find (".coefficient")) != std::string::npos)
{
std::string project = var.first.substr (21, end - 21);
auto project = var.first.substr (21, end - 21);
if (task.get ("project").find (project) == 0)
urgencyTerm (urgencyDetails, "PROJECT " + project, 1.0, var.second);
}
@ -462,7 +462,7 @@ int CmdInfo::execute (std::string& output)
if (var.first.substr (13, 4) == "tag." &&
(end = var.first.find (".coefficient")) != std::string::npos)
{
std::string name = var.first.substr (17, end - 17);
auto name = var.first.substr (17, end - 17);
if (task.hasTag (name))
urgencyTerm (urgencyDetails, "TAG " + name, 1.0, var.second);
}
@ -471,7 +471,7 @@ int CmdInfo::execute (std::string& output)
if (var.first.substr (13, 8) == "keyword." &&
(end = var.first.find (".coefficient")) != std::string::npos)
{
std::string keyword = var.first.substr (21, end - 21);
auto keyword = var.first.substr (21, end - 21);
if (task.get ("description").find (keyword) != std::string::npos)
urgencyTerm (urgencyDetails, "KEYWORD " + keyword, 1.0, var.second);
}
@ -485,7 +485,7 @@ int CmdInfo::execute (std::string& output)
auto end = var.first.find (".coefficient");
if (end != std::string::npos)
{
const std::string uda = var.first.substr (12, end - 12);
auto uda = var.first.substr (12, end - 12);
auto dot = uda.find (".");
if (dot == std::string::npos)
{
@ -591,10 +591,10 @@ void CmdInfo::urgencyTerm (
float measure,
float coefficient) const
{
float value = measure * coefficient;
auto value = measure * coefficient;
if (value != 0.0)
{
int row = view.addRow ();
auto row = view.addRow ();
view.set (row, 0, " " + label);
view.set (row, 1, rightJustify (format (measure, 5, 3), 6));
view.set (row, 2, "*");