github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

clang-format

pull/641/head
Tatsuhiro Tsujikawa 2016-04-21 23:03:24 +09:00
parent aab2472390
commit b316b2cec5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ConsoleStatCalc.cc
View File

@ -124,7 +124,8 @@ void printSizeProgress(ColorizedStream& o,
o << sizeFormatter(rg->getCompletedLength()) << "B/" o << sizeFormatter(rg->getCompletedLength()) << "B/"
<< sizeFormatter(rg->getTotalLength()) << "B"; << sizeFormatter(rg->getTotalLength()) << "B";
if (rg->getTotalLength() > 0) { if (rg->getTotalLength() > 0) {
o << colors::cyan << "(" << 100 * rg->getCompletedLength() / rg->getTotalLength() << "%)"; o << colors::cyan << "("
<< 100 * rg->getCompletedLength() / rg->getTotalLength() << "%)";
o << colors::clear; o << colors::clear;
} }
} }
@ -139,7 +140,8 @@ void printProgressCompact(ColorizedStream& o, const DownloadEngine* e,
NetStat& netstat = e->getRequestGroupMan()->getNetStat(); NetStat& netstat = e->getRequestGroupMan()->getNetStat();
int dl = netstat.calculateDownloadSpeed(); int dl = netstat.calculateDownloadSpeed();
int ul = netstat.calculateUploadSpeed(); int ul = netstat.calculateUploadSpeed();
o << colors::magenta << "[" << colors::clear << "DL:" << colors::green << sizeFormatter(dl) << "B" << colors::clear; o << colors::magenta << "[" << colors::clear << "DL:" << colors::green
<< sizeFormatter(dl) << "B" << colors::clear;
if (ul) { if (ul) {
o << " UL:" << colors::cyan << sizeFormatter(ul) << "B" << colors::clear; o << " UL:" << colors::cyan << sizeFormatter(ul) << "B" << colors::clear;
} }
@ -153,7 +155,8 @@ void printProgressCompact(ColorizedStream& o, const DownloadEngine* e,
++i, ++cnt) { ++i, ++cnt) {
const std::shared_ptr<RequestGroup>& rg = *i; const std::shared_ptr<RequestGroup>& rg = *i;
TransferStat stat = rg->calculateStat(); TransferStat stat = rg->calculateStat();
o << colors::magenta << "[" << colors::clear << "#" << GroupId::toAbbrevHex(rg->getGID()) << " "; o << colors::magenta << "[" << colors::clear << "#"
<< GroupId::toAbbrevHex(rg->getGID()) << " ";
printSizeProgress(o, rg, stat, sizeFormatter); printSizeProgress(o, rg, stat, sizeFormatter);
o << colors::magenta << "]" << colors::clear; o << colors::magenta << "]" << colors::clear;
} }
@ -173,7 +176,8 @@ void printProgress(ColorizedStream& o, const std::shared_ptr<RequestGroup>& rg,
eta = eta =
(rg->getTotalLength() - rg->getCompletedLength()) / stat.downloadSpeed; (rg->getTotalLength() - rg->getCompletedLength()) / stat.downloadSpeed;
} }
o << colors::magenta << "[" << colors::clear << "#" << GroupId::toAbbrevHex(rg->getGID()) << " "; o << colors::magenta << "[" << colors::clear << "#"
<< GroupId::toAbbrevHex(rg->getGID()) << " ";
printSizeProgress(o, rg, stat, sizeFormatter); printSizeProgress(o, rg, stat, sizeFormatter);
o << " CN:" << rg->getNumConnection(); o << " CN:" << rg->getNumConnection();
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
@ -196,7 +200,7 @@ void printProgress(ColorizedStream& o, const std::shared_ptr<RequestGroup>& rg,
if (eta > 0) { if (eta > 0) {
o << " ETA:" << colors::yellow << util::secfmt(eta) << colors::clear; o << " ETA:" << colors::yellow << util::secfmt(eta) << colors::clear;
} }
o << colors::magenta << "]" << colors::clear; o << colors::magenta << "]" << colors::clear;
} }
} // namespace } // namespace