Pārlūkot izejas kodu

2008-11-30 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Print a message when no files to download.
	* src/download_helper.cc
	* src/main.cc
	* src/message.h
Tatsuhiro Tsujikawa 17 gadi atpakaļ
vecāks
revīzija
15586812c5
4 mainītis faili ar 14 papildinājumiem un 2 dzēšanām
  1. 7 0
      ChangeLog
  2. 1 1
      src/download_helper.cc
  3. 5 1
      src/main.cc
  4. 1 0
      src/message.h

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2008-11-30  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Print a message when no files to download.
+	* src/download_helper.cc
+	* src/main.cc
+	* src/message.h
+
 2008-11-28  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	RFC3986 complied Percent-Encoding(urlencode).

+ 1 - 1
src/download_helper.cc

@@ -153,7 +153,7 @@ void createRequestGroupForMetalink
 {
   Metalink2RequestGroup(op).generate(result, op->get(PREF_METALINK_FILE), *op);
   if(result.empty()) {
-    throw FatalException("No files to download.");
+    throw FatalException(MSG_NO_FILES_TO_DOWNLOAD);
   }
 }
 #endif // ENABLE_METALINK

+ 5 - 1
src/main.cc

@@ -146,6 +146,7 @@ int main(int argc, char* argv[])
 	DefaultBtContextHandle btContext(new DefaultBtContext());
 	btContext->load(op->get(PREF_TORRENT_FILE));
 	std::cout << btContext << std::endl;
+	return EXIT_SUCCESS;
       } else {
 	createRequestGroupForBitTorrent(requestGroups, op, args);
       }
@@ -161,6 +162,7 @@ int main(int argc, char* argv[])
 	  std::deque<SharedHandle<FileEntry> > fileEntries;
 	  MetalinkEntry::toFileEntry(fileEntries, metalinkEntries);
 	  Util::toStream(std::cout, fileEntries);
+	  return EXIT_SUCCESS;
 	} else {
 	  createRequestGroupForMetalink(requestGroups, op);
 	}
@@ -173,7 +175,9 @@ int main(int argc, char* argv[])
 	  createRequestGroupForUri(requestGroups, op, args);
 	}
 
-    if(!requestGroups.empty()) {
+    if(requestGroups.empty()) {
+      std::cout << MSG_NO_FILES_TO_DOWNLOAD << std::endl;
+    } else {
       returnValue = MultiUrlRequestInfo(requestGroups, op, getStatCalc(op),
 					getSummaryOut(op)).execute();
     }

+ 1 - 0
src/message.h

@@ -163,6 +163,7 @@
   _("Certificate verification failed. Cause: %s")
 #define MSG_NO_CERT_FOUND _("No certificate found.")
 #define MSG_HOSTNAME_NOT_MATCH _("Hostname not match.")
+#define MSG_NO_FILES_TO_DOWNLOAD _("No files to download.")
 
 #define EX_TIME_OUT _("Timeout.")
 #define EX_INVALID_CHUNK_SIZE _("Invalid chunk size.")