2007-10-14 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

* src/MultiUrlRequestInfo.h: Updated the message shown when 
program
	stops and there are any unfinished or in-progress downloads.
	Added the legend of "stat".
pull/1/head
Tatsuhiro Tsujikawa 2007-10-13 15:47:22 +00:00
parent 1171a2063f
commit e5454000a6
4 changed files with 15 additions and 16 deletions

View File

@ -1,3 +1,9 @@
2007-10-14 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* src/MultiUrlRequestInfo.h: Updated the message shown when program
stops and there are any unfinished or in-progress downloads.
Added the legend of "stat".
2007-10-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2007-10-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Throw exception when chunck checksum verification fails. Throw exception when chunck checksum verification fails.

View File

@ -64,12 +64,13 @@ MultiUrlRequestInfo::MultiUrlRequestInfo(const RequestGroups& requestGroups, Opt
MultiUrlRequestInfo::~MultiUrlRequestInfo() {} MultiUrlRequestInfo::~MultiUrlRequestInfo() {}
void MultiUrlRequestInfo::printDownloadAbortMessage() void MultiUrlRequestInfo::printMessageForContinue()
{ {
printf(_("\nSome downloads were not complete because of errors." cout << "\n"
" Check the log.\n" << _("aria2 will resume download if the transfer is restarted.")
"aria2 will resume download if the transfer is restarted.")); << "\n"
printf("\n"); << _("If there are any errors, then see the log file. See '-l' option in help/man page for details.")
<< "\n";
} }
void MultiUrlRequestInfo::execute() void MultiUrlRequestInfo::execute()
@ -102,7 +103,7 @@ void MultiUrlRequestInfo::execute()
cout << flush; cout << flush;
if(!e->_requestGroupMan->downloadFinished()) { if(!e->_requestGroupMan->downloadFinished()) {
printDownloadAbortMessage(); printMessageForContinue();
} }
} catch(RecoverableException *ex) { } catch(RecoverableException *ex) {
_logger->error(EX_EXCEPTION_CAUGHT, ex); _logger->error(EX_EXCEPTION_CAUGHT, ex);

View File

@ -51,7 +51,7 @@ private:
const Logger* _logger; const Logger* _logger;
void printDownloadAbortMessage(); void printMessageForContinue();
public: public:
MultiUrlRequestInfo(const RequestGroups& requestGroups, Option* op); MultiUrlRequestInfo(const RequestGroups& requestGroups, Option* op);

View File

@ -208,17 +208,9 @@ void RequestGroupMan::showDownloadResults(ostream& o) const
// ===+====+======================================================================= // ===+====+=======================================================================
o << "\n" o << "\n"
<<_("Download Results:") << "\n" <<_("Download Results:") << "\n"
<< " (OK):download completed.(ERR):error occurred.(INPR):download in-progress." << "\n"
<< "idx|stat|path/URI" << "\n" << "idx|stat|path/URI" << "\n"
<< "===+====+======================================================================" << "\n"; << "===+====+======================================================================" << "\n";
/*
RequestGroups groups(_spentGroups.begin(), _spentGroups.end());
for(RequestGroups::const_iterator itr = _requestGroups.begin();
itr != _requestGroups.end(); ++itr) {
if((*itr)->downloadFinished()) {
groups.push_back(*itr);
}
}
*/
for(RequestGroups::const_iterator itr = _spentGroups.begin(); for(RequestGroups::const_iterator itr = _spentGroups.begin();
itr != _spentGroups.end(); ++itr) { itr != _spentGroups.end(); ++itr) {
o << formatDownloadResult((*itr)->downloadFinished()?"OK":"ERR", *itr) << "\n"; o << formatDownloadResult((*itr)->downloadFinished()?"OK":"ERR", *itr) << "\n";