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".

3 files changed, 9 insertions, 16 deletions

diff --git a/src/MultiUrlRequestInfo.cc b/src/MultiUrlRequestInfo.cc
index 6f7965c4..fd6e10b0 100644
--- a/src/MultiUrlRequestInfo.cc
+++ b/src/MultiUrlRequestInfo.cc
@@ -64,12 +64,13 @@ MultiUrlRequestInfo::MultiUrlRequestInfo(const RequestGroups& requestGroups, Opt
 
 MultiUrlRequestInfo::~MultiUrlRequestInfo() {}
 
-void MultiUrlRequestInfo::printDownloadAbortMessage()
+void MultiUrlRequestInfo::printMessageForContinue()
 {
-  printf(_("\nSome downloads were not complete because of errors."
-	   " Check the log.\n"
-	   "aria2 will resume download if the transfer is restarted."));
-  printf("\n");
+  cout << "\n"
+       << _("aria2 will resume download if the transfer is restarted.")
+       << "\n"
+       << _("If there are any errors, then see the log file. See '-l' option in help/man page for details.")
+       << "\n";
 }
 
 void MultiUrlRequestInfo::execute()
@@ -102,7 +103,7 @@ void MultiUrlRequestInfo::execute()
     cout << flush;
 
     if(!e->_requestGroupMan->downloadFinished()) {
-      printDownloadAbortMessage();
+      printMessageForContinue();
     }
   } catch(RecoverableException *ex) {
     _logger->error(EX_EXCEPTION_CAUGHT, ex);
diff --git a/src/MultiUrlRequestInfo.h b/src/MultiUrlRequestInfo.h
index c7f7916d..7eac2ed6 100644
--- a/src/MultiUrlRequestInfo.h
+++ b/src/MultiUrlRequestInfo.h
@@ -51,7 +51,7 @@ private:
 
   const Logger* _logger;
 
-  void printDownloadAbortMessage();
+  void printMessageForContinue();
 
 public:
   MultiUrlRequestInfo(const RequestGroups& requestGroups, Option* op);
diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc
index 5d13a845..00f8d031 100644
--- a/src/RequestGroupMan.cc
+++ b/src/RequestGroupMan.cc
@@ -208,17 +208,9 @@ void RequestGroupMan::showDownloadResults(ostream& o) const
   // ===+====+=======================================================================
   o << "\n"
     <<_("Download Results:") << "\n"
+    << " (OK):download completed.(ERR):error occurred.(INPR):download in-progress." << "\n"
     << "idx|stat|path/URI" << "\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();
       itr != _spentGroups.end(); ++itr) {
     o << formatDownloadResult((*itr)->downloadFinished()?"OK":"ERR", *itr) << "\n";