From c1ddf34e4bc082a0422bf26818ea73e571596660 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 26 Jul 2012 21:20:08 +0900
Subject: [PATCH] Specify torrent file explicitly in
 createRequestGroupForBitTorrent()

---
 src/RpcMethodImpl.cc                 |  6 +++---
 src/UTMetadataPostDownloadHandler.cc |  3 ++-
 src/download_helper.cc               |  8 +++-----
 src/download_helper.h                | 13 +++++++++----
 src/main.cc                          |  3 ++-
 test/DownloadHelperTest.cc           | 13 ++++++++-----
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/RpcMethodImpl.cc b/src/RpcMethodImpl.cc
index e8284933..e9552a20 100644
--- a/src/RpcMethodImpl.cc
+++ b/src/RpcMethodImpl.cc
@@ -293,13 +293,13 @@ SharedHandle<ValueBase> AddTorrentRpcMethod::process
   if(util::saveAs(filename, torrentParam->s(), true)) {
     A2_LOG_INFO(fmt("Uploaded torrent data was saved as %s", filename.c_str()));
     requestOption->put(PREF_TORRENT_FILE, filename);
-    createRequestGroupForBitTorrent(result, requestOption, uris);
   } else {
     A2_LOG_INFO(fmt("Uploaded torrent data was not saved."
                     " Failed to write file %s", filename.c_str()));
-    createRequestGroupForBitTorrent(result, requestOption,
-                                    uris, torrentParam->s());
+    filename.clear();
   }
+  createRequestGroupForBitTorrent(result, requestOption, uris, filename,
+                                  torrentParam->s());
 
   if(!result.empty()) {
     return addRequestGroup(result.front(), e, posGiven, pos);
diff --git a/src/UTMetadataPostDownloadHandler.cc b/src/UTMetadataPostDownloadHandler.cc
index 3dd9329d..13623fc1 100644
--- a/src/UTMetadataPostDownloadHandler.cc
+++ b/src/UTMetadataPostDownloadHandler.cc
@@ -97,7 +97,8 @@ void UTMetadataPostDownloadHandler::getNextRequestGroups
     // Don't adjust announce URI because it has been done when
     // RequestGroup is created with magnet URI.
     createRequestGroupForBitTorrent(newRgs, requestGroup->getOption(),
-                                    std::vector<std::string>(), torrent, false);
+                                    std::vector<std::string>(),
+                                    A2STR::NIL, torrent, false);
     requestGroup->followedBy(newRgs.begin(), newRgs.end());
     if(requestGroup->getMetadataInfo()) {
       setMetadataInfo(newRgs.begin(), newRgs.end(),
diff --git a/src/download_helper.cc b/src/download_helper.cc
index 90707cd3..adec256c 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -242,13 +242,14 @@ void createRequestGroupForBitTorrent
 (std::vector<SharedHandle<RequestGroup> >& result,
  const SharedHandle<Option>& option,
  const std::vector<std::string>& uris,
+ const std::string& metaInfoUri,
  const std::string& torrentData,
  bool adjustAnnounceUri)
 {
   SharedHandle<ValueBase> torrent;
   bittorrent::ValueBaseBencodeParser parser;
   if(torrentData.empty()) {
-    torrent = parseFile(parser, option->get(PREF_TORRENT_FILE));
+    torrent = parseFile(parser, metaInfoUri);
   } else {
     ssize_t error;
     torrent = parser.parseFinal(torrentData.c_str(), torrentData.size(),
@@ -258,10 +259,7 @@ void createRequestGroupForBitTorrent
     throw DL_ABORT_EX2("Bencode decoding failed",
                        error_code::BENCODE_PARSE_ERROR);
   }
-  createRequestGroupForBitTorrent(result, option, uris,
-                                  torrentData.empty() ?
-                                  option->get(PREF_TORRENT_FILE) : "",
-                                  torrent);
+  createRequestGroupForBitTorrent(result, option, uris, metaInfoUri, torrent);
 }
 
 void createRequestGroupForBitTorrent
diff --git a/src/download_helper.h b/src/download_helper.h
index 46cb7000..d12ba501 100644
--- a/src/download_helper.h
+++ b/src/download_helper.h
@@ -54,18 +54,23 @@ class ValueBase;
 
 #ifdef ENABLE_BITTORRENT
 // Create RequestGroup object using torrent file specified by
-// torrent-file option.  If non-empty torrentData is specified, then
-// it is used as a content of torrent file instead. If
-// adjustAnnounceUri is true, announce URIs are adjusted using
-// bittorrent::adjustAnnounceUri().  In this function,
+// metaInfoUri, which is treated as local file path. If non-empty
+// torrentData is specified, then it is used as a content of torrent
+// file instead. If adjustAnnounceUri is true, announce URIs are
+// adjusted using bittorrent::adjustAnnounceUri().  In this function,
 // force-sequential is ignored.
 void createRequestGroupForBitTorrent
 (std::vector<SharedHandle<RequestGroup> >& result,
  const SharedHandle<Option>& option,
  const std::vector<std::string>& uris,
+ const std::string& metaInfoUri,
  const std::string& torrentData = "",
  bool adjustAnnounceUri = true);
 
+// Create RequestGroup object using already decoded torrent metainfo
+// structure.  If adjustAnnounceUri is true, announce URIs are
+// adjusted using bittorrent::adjustAnnounceUri().  In this function,
+// force-sequential is ignored.
 void createRequestGroupForBitTorrent
 (std::vector<SharedHandle<RequestGroup> >& result,
  const SharedHandle<Option>& option,
diff --git a/src/main.cc b/src/main.cc
index fc6fada6..be2fcc3b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -233,7 +233,8 @@ error_code::Value main(int argc, char* argv[])
       showTorrentFile(op->get(PREF_TORRENT_FILE));
       return exitStatus;
     } else {
-      createRequestGroupForBitTorrent(requestGroups, op, args);
+      createRequestGroupForBitTorrent(requestGroups, op, args,
+                                      op->get(PREF_TORRENT_FILE));
     }
   }
   else
diff --git a/test/DownloadHelperTest.cc b/test/DownloadHelperTest.cc
index 6b425206..e055fe56 100644
--- a/test/DownloadHelperTest.cc
+++ b/test/DownloadHelperTest.cc
@@ -320,8 +320,9 @@ void DownloadHelperTest::testCreateRequestGroupForBitTorrent()
   option_->put(PREF_BT_EXCLUDE_TRACKER, "http://tracker1");
   {
     std::vector<SharedHandle<RequestGroup> > result;
-  
-    createRequestGroupForBitTorrent(result, option_, auxURIs);
+
+    createRequestGroupForBitTorrent(result, option_, auxURIs,
+                                    option_->get(PREF_TORRENT_FILE));
 
     CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());
 
@@ -344,7 +345,8 @@ void DownloadHelperTest::testCreateRequestGroupForBitTorrent()
     // no URIs are given
     std::vector<SharedHandle<RequestGroup> > result;
     std::vector<std::string> emptyURIs;
-    createRequestGroupForBitTorrent(result, option_, emptyURIs);
+    createRequestGroupForBitTorrent(result, option_, emptyURIs,
+                                    option_->get(PREF_TORRENT_FILE));
 
     CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());
     SharedHandle<RequestGroup> group = result[0];
@@ -355,8 +357,9 @@ void DownloadHelperTest::testCreateRequestGroupForBitTorrent()
   option_->put(PREF_FORCE_SEQUENTIAL, A2_V_TRUE);
   {
     std::vector<SharedHandle<RequestGroup> > result;
-  
-    createRequestGroupForBitTorrent(result, option_, auxURIs);
+
+    createRequestGroupForBitTorrent(result, option_, auxURIs,
+                                    option_->get(PREF_TORRENT_FILE));
 
     // See --force-requencial is ignored
     CPPUNIT_ASSERT_EQUAL((size_t)1, result.size());