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

CmdDiagnostics: Remove redundant nesting

Browse source
This commit is contained in:
Tomas Babej 2015-09-18 15:40:02 +02:00 • committed by Paul Beckingham
parent 22368b9a40
commit 0693f3cfc4
1 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/commands/CmdDiagnostics.cpp
View file

@ -337,45 +337,44 @@ int CmdDiagnostics::execute (std::string& output)
// Verify UUIDs are all unique. // Verify UUIDs are all unique.
out << bold.colorize (STRING_CMD_DIAG_TESTS) out << bold.colorize (STRING_CMD_DIAG_TESTS)
<< "\n"; << "\n";
// Determine terminal details.
const char* term = getenv ("TERM");
out << " $TERM: "
<< (term ? term : STRING_CMD_DIAG_NONE)
<< " ("
<< context.getWidth ()
<< "x"
<< context.getHeight ()
<< ")\n";
// Scan tasks for duplicate UUIDs.
std::vector <Task> all = context.tdb2.all_tasks ();
std::map <std::string, int> seen;
std::vector <std::string> dups;
std::string uuid;
for (auto& i : all)
{ {
// Determine terminal details. uuid = i.get ("uuid");
const char* term = getenv ("TERM"); if (seen.find (uuid) != seen.end ())
out << " $TERM: " dups.push_back (uuid);
<< (term ? term : STRING_CMD_DIAG_NONE)
<< " ("
<< context.getWidth ()
<< "x"
<< context.getHeight ()
<< ")\n";
// Scan tasks for duplicate UUIDs.
std::vector <Task> all = context.tdb2.all_tasks ();
std::map <std::string, int> seen;
std::vector <std::string> dups;
std::string uuid;
for (auto& i : all)
{
uuid = i.get ("uuid");
if (seen.find (uuid) != seen.end ())
dups.push_back (uuid);
else
seen[uuid] = 0;
}
out << " Dups: "
<< format (STRING_CMD_DIAG_UUID_SCAN, all.size ())
<< "\n";
if (dups.size ())
{
for (auto& d : dups)
out << " " << format (STRING_CMD_DIAG_UUID_DUP, d) << "\n";
}
else else
{ seen[uuid] = 0;
out << " " << STRING_CMD_DIAG_UUID_NO_DUP }
<< "\n";
} out << " Dups: "
<< format (STRING_CMD_DIAG_UUID_SCAN, all.size ())
<< "\n";
if (dups.size ())
{
for (auto& d : dups)
out << " " << format (STRING_CMD_DIAG_UUID_DUP, d) << "\n";
}
else
{
out << " " << STRING_CMD_DIAG_UUID_NO_DUP
<< "\n";
} }
out << "\n"; out << "\n";