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

2007-07-04 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Made console readout more readable.
	* src/ConsoleDownloadEngine.cc (sendStatistics)
pull/1/head
Tatsuhiro Tsujikawa 2007-07-03 15:24:36 +00:00
parent 583f6c9c22
commit e5e46914d1
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-04 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Made console readout more readable.
* src/ConsoleDownloadEngine.cc (sendStatistics)
2007-07-02 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2007-07-02 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fix the bug that causes -s option not to work. Fix the bug that causes -s option not to work.

23
src/ConsoleDownloadEngine.cc
View File

@ -69,6 +69,7 @@ void ConsoleDownloadEngine::sendStatistics(long long int currentSize, long long
cout << "[" cout << "["
<< "#" << firstRequestGroup->getGID() << " " << "#" << firstRequestGroup->getGID() << " "
<< "SIZE:"
<< Util::abbrevSize(firstRequestGroup->getDownloadLength()) << Util::abbrevSize(firstRequestGroup->getDownloadLength())
<< "B" << "B"
<< "/" << "/"
@ -79,29 +80,29 @@ void ConsoleDownloadEngine::sendStatistics(long long int currentSize, long long
<< 100*firstRequestGroup->getDownloadLength()/firstRequestGroup->getTotalLength() << 100*firstRequestGroup->getDownloadLength()/firstRequestGroup->getTotalLength()
<< "%)"; << "%)";
} }
cout << "(" cout << " "
<< firstRequestGroup->numConnection << "CN:"
<< "cn)"; << firstRequestGroup->numConnection;
cout << "(" cout << " "
<< fixed << setprecision(2) << "SPD:"
<< dlSpeed/1024.0 << "KiB/s" << fixed << setprecision(2) << dlSpeed/1024.0 << "KiB/s";
<< ")";
if(eta > 0) { if(eta > 0) {
cout << " " cout << " "
<< "ETA:" << "ETA:"
<< Util::secfmt(eta); << Util::secfmt(eta);
} }
cout << "]";
if(_requestGroupMan->countRequestGroup() > 1) { if(_requestGroupMan->countRequestGroup() > 1) {
cout << "(" cout << "("
<< _requestGroupMan->countRequestGroup()-1 << _requestGroupMan->countRequestGroup()-1
<< "more...)"; << "more...)";
} }
cout << "]";
} }
if(_requestGroupMan->countRequestGroup() > 1) { if(_requestGroupMan->countRequestGroup() > 1) {
cout << " " cout << " "
<< "[" << fixed << setprecision(2) << speed/1024.0 << "KiB/s" << "]"; << "[TOTAL SPD:"
<< fixed << setprecision(2) << speed/1024.0 << "KiB/s" << "]";
} }
{ {
@ -118,12 +119,12 @@ void ConsoleDownloadEngine::sendStatistics(long long int currentSize, long long
<< "(" << "("
<< 100*entry->getCurrentLength()/entry->getTotalLength() << 100*entry->getCurrentLength()/entry->getTotalLength()
<< "%)"; << "%)";
cout << "]";
if(_fileAllocationMan->countFileAllocationEntryInQueue() > 0) { if(_fileAllocationMan->countFileAllocationEntryInQueue() > 0) {
cout << "(" cout << "("
<< _fileAllocationMan->countFileAllocationEntryInQueue() << _fileAllocationMan->countFileAllocationEntryInQueue()
<< "waiting...)"; << "waiting...)";
} }
cout << "]";
} }
} }
{ {
@ -140,12 +141,12 @@ void ConsoleDownloadEngine::sendStatistics(long long int currentSize, long long
<< "(" << "("
<< 100*entry->getCurrentLength()/entry->getTotalLength() << 100*entry->getCurrentLength()/entry->getTotalLength()
<< "%)"; << "%)";
cout << "]";
if(_checkIntegrityMan->countCheckIntegrityEntry() > 1) { if(_checkIntegrityMan->countCheckIntegrityEntry() > 1) {
cout << "(" cout << "("
<< _checkIntegrityMan->countCheckIntegrityEntry()-1 << _checkIntegrityMan->countCheckIntegrityEntry()-1
<< "more...)"; << "more...)";
} }
cout << "]";
} }
} }
cout << flush; cout << flush;