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

Don't show metadata download and paused download in "Download Results".

pull/1/head
Tatsuhiro Tsujikawa 2011-01-16 22:20:29 +09:00
parent 9fe35495fd
commit 90d94953d7
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/RequestGroupMan.cc
View File

@ -575,6 +575,9 @@ RequestGroupMan::DownloadStat RequestGroupMan::getDownloadStat() const
for(std::deque<SharedHandle<DownloadResult> >::const_iterator itr = for(std::deque<SharedHandle<DownloadResult> >::const_iterator itr =
downloadResults_.begin(), eoi = downloadResults_.end(); downloadResults_.begin(), eoi = downloadResults_.end();
itr != eoi; ++itr) { itr != eoi; ++itr) {
if((*itr)->belongsTo != 0) {
continue;
}
if((*itr)->result == error_code::FINISHED) { if((*itr)->result == error_code::FINISHED) {
++finished; ++finished;
} else { } else {
@ -582,15 +585,6 @@ RequestGroupMan::DownloadStat RequestGroupMan::getDownloadStat() const
lastError = (*itr)->result; lastError = (*itr)->result;
} }
} }
for(std::deque<SharedHandle<RequestGroup> >::const_iterator itr =
requestGroups_.begin(), eoi = requestGroups_.end(); itr != eoi; ++itr) {
DownloadResultHandle result = (*itr)->createDownloadResult();
if(result->result == error_code::FINISHED) {
++finished;
} else {
++inprogress;
}
}
return DownloadStat(finished, error, inprogress, reservedGroups_.size(), return DownloadStat(finished, error, inprogress, reservedGroups_.size(),
lastError); lastError);
} }
@ -621,6 +615,9 @@ void RequestGroupMan::showDownloadResults(std::ostream& o) const
for(std::deque<SharedHandle<DownloadResult> >::const_iterator itr = for(std::deque<SharedHandle<DownloadResult> >::const_iterator itr =
downloadResults_.begin(), eoi = downloadResults_.end(); downloadResults_.begin(), eoi = downloadResults_.end();
itr != eoi; ++itr) { itr != eoi; ++itr) {
if((*itr)->belongsTo != 0) {
continue;
}
std::string status; std::string status;
if((*itr)->result == error_code::FINISHED) { if((*itr)->result == error_code::FINISHED) {
status = MARK_OK; status = MARK_OK;
@ -634,16 +631,6 @@ void RequestGroupMan::showDownloadResults(std::ostream& o) const
} }
o << formatDownloadResult(status, *itr) << "\n"; o << formatDownloadResult(status, *itr) << "\n";
} }
for(std::deque<SharedHandle<RequestGroup> >::const_iterator itr =
reservedGroups_.begin(), eoi = reservedGroups_.end();
itr != eoi; ++itr) {
if(!(*itr)->isPauseRequested()) {
continue;
}
SharedHandle<DownloadResult> result = (*itr)->createDownloadResult();
++inpr;
o << formatDownloadResult(MARK_INPR, result) << "\n";
}
if(ok > 0 || err > 0 || inpr > 0) { if(ok > 0 || err > 0 || inpr > 0) {
o << "\n" o << "\n"
<< _("Status Legend:") << "\n"; << _("Status Legend:") << "\n";
@ -768,14 +755,14 @@ void RequestGroupMan::addDownloadResult(const SharedHandle<DownloadResult>& dr)
for(std::deque<SharedHandle<DownloadResult> >::iterator i = for(std::deque<SharedHandle<DownloadResult> >::iterator i =
downloadResults_.begin(), eoi = downloadResults_.end(); i != eoi; downloadResults_.begin(), eoi = downloadResults_.end(); i != eoi;
++i) { ++i) {
if((*i)->result != error_code::FINISHED) { if((*i)->belongsTo == 0 && (*i)->result != error_code::FINISHED) {
removedLastErrorResult_ = (*i)->result; removedLastErrorResult_ = (*i)->result;
++removedErrorResult_; ++removedErrorResult_;
} }
} }
downloadResults_.clear(); downloadResults_.clear();
} }
if(dr->result != error_code::FINISHED) { if(dr->belongsTo == 0 && dr->result != error_code::FINISHED) {
removedLastErrorResult_ = dr->result; removedLastErrorResult_ = dr->result;
++removedErrorResult_; ++removedErrorResult_;
} }
@ -786,7 +773,7 @@ void RequestGroupMan::addDownloadResult(const SharedHandle<DownloadResult>& dr)
downloadResults_.begin()+curSize-maxDownloadResult_+1; downloadResults_.begin()+curSize-maxDownloadResult_+1;
for(std::deque<SharedHandle<DownloadResult> >::iterator i = for(std::deque<SharedHandle<DownloadResult> >::iterator i =
downloadResults_.begin(); i != last; ++i) { downloadResults_.begin(); i != last; ++i) {
if((*i)->result != error_code::FINISHED) { if((*i)->belongsTo == 0 && (*i)->result != error_code::FINISHED) {
removedLastErrorResult_ = (*i)->result; removedLastErrorResult_ = (*i)->result;
++removedErrorResult_; ++removedErrorResult_;
} }