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

2008-10-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Now each status legends is shown only when it appears in Download
	Result. If Download Result has no item, then status legend will not
	be printed.
	* src/RequestGroupMan.cc
pull/1/head
Tatsuhiro Tsujikawa 2008-10-21 16:26:43 +00:00
parent 450b759cc9
commit e15d104d88
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-10-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Now each status legends is shown only when it appears in Download
Result. If Download Result has no item, then status legend will not
be printed.
* src/RequestGroupMan.cc
2008-10-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-10-22 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Removed duplicate creation of OptionHandlers. Removed duplicate creation of OptionHandlers.

45
src/RequestGroupMan.cc
View File

@ -382,20 +382,51 @@ void RequestGroupMan::showDownloadResults(std::ostream& o) const
<<_("Download Results:") << "\n" <<_("Download Results:") << "\n"
<< "gid|stat|path/URI" << "\n" << "gid|stat|path/URI" << "\n"
<< "===+====+======================================================================" << "\n"; << "===+====+======================================================================" << "\n";
int ok = 0;
int err = 0;
int inpr = 0;
for(std::deque<SharedHandle<DownloadResult> >::const_iterator itr = _downloadResults.begin(); for(std::deque<SharedHandle<DownloadResult> >::const_iterator itr = _downloadResults.begin();
itr != _downloadResults.end(); ++itr) { itr != _downloadResults.end(); ++itr) {
o << formatDownloadResult((*itr)->result == DownloadResult::FINISHED ? std::string status;
MARK_OK : MARK_ERR, *itr) << "\n"; if((*itr)->result == DownloadResult::FINISHED) {
status = MARK_OK;
++ok;
} else {
status = MARK_ERR;
++err;
}
o << formatDownloadResult(status, *itr) << "\n";
} }
for(RequestGroups::const_iterator itr = _requestGroups.begin(); for(RequestGroups::const_iterator itr = _requestGroups.begin();
itr != _requestGroups.end(); ++itr) { itr != _requestGroups.end(); ++itr) {
DownloadResultHandle result = (*itr)->createDownloadResult(); DownloadResultHandle result = (*itr)->createDownloadResult();
o << formatDownloadResult(result->result == DownloadResult::FINISHED ? std::string status;
MARK_OK : MARK_INPR, result) << "\n"; if(result->result == DownloadResult::FINISHED) {
status = MARK_OK;
++ok;
} else {
status = MARK_INPR;
++inpr;
}
o << formatDownloadResult(status, result) << "\n";
}
if(ok > 0 || err > 0 || inpr > 0) {
o << "\n"
<< _("Status Legend:") << "\n";
if(ok > 0) {
o << " (OK):download completed.";
}
if(err > 0) {
o << "(ERR):error occurred.";
}
if(inpr > 0) {
o << "(INPR):download in-progress.";
}
o << "\n";
} }
o << "\n"
<< _("Status Legend:") << "\n"
<< " (OK):download completed.(ERR):error occurred.(INPR):download in-progress." << "\n";
} }
std::string RequestGroupMan::formatDownloadResult(const std::string& status, const DownloadResultHandle& downloadResult) const std::string RequestGroupMan::formatDownloadResult(const std::string& status, const DownloadResultHandle& downloadResult) const