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

CmdHistory: Code cleanup

Browse source
This commit is contained in:
Paul Beckingham 2017-01-29 12:13:30 -05:00
parent 25dbbfd667
commit d8a1120ff2
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/commands/CmdHistory.cpp
View file

@ -60,7 +60,7 @@ CmdHistoryBase<HistoryStrategy>::CmdHistoryBase ()
template<class HistoryStrategy> template<class HistoryStrategy>
void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output) void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
{ {
int widthOfBar = context.getWidth () - 15; // 15 == strlen ("2008 September ") auto widthOfBar = context.getWidth () - 15; // 15 == strlen ("2008 September ")
// Now build the view. // Now build the view.
Table view; Table view;
@ -80,8 +80,8 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
view.colorHeader (label); view.colorHeader (label);
// Determine the longest line, and the longest "added" line. // Determine the longest line, and the longest "added" line.
int maxAddedLine = 0; auto maxAddedLine = 0;
int maxRemovedLine = 0; auto maxRemovedLine = 0;
for (auto& i : groups) for (auto& i : groups)
{ {
if (completedGroup[i.first] + deletedGroup[i.first] > maxRemovedLine) if (completedGroup[i.first] + deletedGroup[i.first] > maxRemovedLine)
@ -91,17 +91,17 @@ void CmdHistoryBase<HistoryStrategy>::outputGraphical (std::string &output)
maxAddedLine = addedGroup[i.first]; maxAddedLine = addedGroup[i.first];
} }
int maxLine = maxAddedLine + maxRemovedLine; auto maxLine = maxAddedLine + maxRemovedLine;
if (maxLine > 0) if (maxLine > 0)
{ {
unsigned int leftOffset = (widthOfBar * maxAddedLine) / maxLine; unsigned int leftOffset = (widthOfBar * maxAddedLine) / maxLine;
int totalAdded = 0; auto totalAdded = 0;
int totalCompleted = 0; auto totalCompleted = 0;
int totalDeleted = 0; auto totalDeleted = 0;
time_t priorTime = 0; time_t priorTime = 0;
int row = 0; auto row = 0;
for (auto& i : groups) for (auto& i : groups)
{ {
row = view.addRow (); row = view.addRow ();
@ -213,11 +213,11 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
view.colorHeader (label); view.colorHeader (label);
} }
int totalAdded = 0; auto totalAdded = 0;
int totalCompleted = 0; auto totalCompleted = 0;
int totalDeleted = 0; auto totalDeleted = 0;
int row = 0; auto row = 0;
time_t lastTime = 0; time_t lastTime = 0;
for (auto& i : groups) for (auto& i : groups)
{ {
@ -230,7 +230,7 @@ void CmdHistoryBase<HistoryStrategy>::outputTabular (std::string &output)
HistoryStrategy::insertRowDate (view, row, i.first, lastTime); HistoryStrategy::insertRowDate (view, row, i.first, lastTime);
lastTime = i.first; lastTime = i.first;
int net = 0; auto net = 0;
if (addedGroup.find (i.first) != addedGroup.end ()) if (addedGroup.find (i.first) != addedGroup.end ())
{ {
@ -316,7 +316,7 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
if (task.has ("end")) if (task.has ("end"))
end = Datetime (task.get_date ("end")); end = Datetime (task.get_date ("end"));
time_t epoch = HistoryStrategy::getRelevantDate (entry).toEpoch (); auto epoch = HistoryStrategy::getRelevantDate (entry).toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
// Every task has an entry date, but exclude templates. // Every task has an entry date, but exclude templates.
@ -341,12 +341,10 @@ int CmdHistoryBase<HistoryStrategy>::execute (std::string& output)
} }
// Now build the view. // Now build the view.
if (HistoryStrategy::graphical)
if (HistoryStrategy::graphical) {
this->outputGraphical (output); this->outputGraphical (output);
} else { else
this->outputTabular (output); this->outputTabular (output);
}
return rc; return rc;
} }