From 7f7ea34a4a6a76500ca509bfd5f3705b4487d619 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 8 May 2009 08:18:23 +0000 Subject: [PATCH] 2009-05-08 Tatsuhiro Tsujikawa 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 --- ChangeLog | 9 +++++++++ src/RequestGroupMan.cc | 3 +++ src/main.cc | 6 +++++- src/option_processing.cc | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3c2db89a..fcf974ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-05-08 Tatsuhiro Tsujikawa + + 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 Added missing AM_CONDITIONAL diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc index 0e2c5af1..714c1efd 100644 --- a/src/RequestGroupMan.cc +++ b/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; } diff --git a/src/main.cc b/src/main.cc index db289d62..9ccb624e 100644 --- a/src/main.cc +++ b/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), diff --git a/src/option_processing.cc b/src/option_processing.cc index 7f0eb820..a3587e5b 100644 --- a/src/option_processing.cc +++ b/src/option_processing.cc @@ -173,6 +173,9 @@ void option_processing(Option& op, std::deque& 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