Browse Source

2009-05-08 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	If --enable-http-server is enabled, don't stop aria2 when all
	download finished and don't quit when no files to download at
	start up.
	* src/RequestGroupMan.cc
	* src/main.cc
	* src/option_processing.cc
Tatsuhiro Tsujikawa 16 years ago
parent
commit
7f7ea34a4a
4 changed files with 20 additions and 1 deletions
  1. 9 0
      ChangeLog
  2. 3 0
      src/RequestGroupMan.cc
  3. 5 1
      src/main.cc
  4. 3 0
      src/option_processing.cc

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+2009-05-08  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	If --enable-http-server is enabled, don't stop aria2 when all
+	download finished and don't quit when no files to download at
+	start up.
+	* src/RequestGroupMan.cc
+	* src/main.cc
+	* src/option_processing.cc
+	
 2009-05-08  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added missing AM_CONDITIONAL

+ 3 - 0
src/RequestGroupMan.cc

@@ -83,6 +83,9 @@ RequestGroupMan::RequestGroupMan(const RequestGroups& requestGroups,
 
 bool RequestGroupMan::downloadFinished()
 {
+  if(_option->getAsBool(PREF_ENABLE_HTTP_SERVER)) {
+    return false;
+  }
   if(!_reservedGroups.empty()) {
     return false;
   }

+ 5 - 1
src/main.cc

@@ -236,7 +236,11 @@ DownloadResult::RESULT main(int argc, char* argv[])
 	  createRequestGroupForUri(requestGroups, op, args);
 	}
 
-    if(requestGroups.empty()) {
+    if(
+#ifdef ENABLE_XML_RPC
+       !op.getAsBool(PREF_ENABLE_HTTP_SERVER) &&
+#endif // ENABLE_XML_RPC
+       requestGroups.empty()) {
       std::cout << MSG_NO_FILES_TO_DOWNLOAD << std::endl;
     } else {
       exitStatus = MultiUrlRequestInfo(requestGroups, &op, getStatCalc(&op),

+ 3 - 0
src/option_processing.cc

@@ -173,6 +173,9 @@ void option_processing(Option& op, std::deque<std::string>& uris,
     exit(DownloadResult::UNKNOWN_ERROR);
   }
   if(
+#ifdef ENABLE_XML_RPC
+     !op.getAsBool(PREF_ENABLE_HTTP_SERVER) &&
+#endif // ENABLE_XML_RPC
 #ifdef ENABLE_BITTORRENT
      op.blank(PREF_TORRENT_FILE) &&
 #endif // ENABLE_BITTORRENT