Parse torrent file on the fly if --follow-torrent=mem is given

In this changes, Bencode parser in bencode2 is removed and the request
is delegated to BencodeParser.

3 files changed, 17 insertions, 203 deletions

diff --git a/test/AnnounceListTest.cc b/test/AnnounceListTest.cc
index 5bb528e5..5105ff3c 100644
--- a/test/AnnounceListTest.cc
+++ b/test/AnnounceListTest.cc
@@ -65,12 +65,12 @@ std::vector<std::vector<std::string> > toVector
 void AnnounceListTest::testSingleElementList() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
   SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+    bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
   AnnounceList announceList(toVector(downcast<List>(announcesList)));
-  
+
   CPPUNIT_ASSERT(!announceList.allTiersFailed());
   std::string url =  announceList.getAnnounce();
   std::string event = announceList.getEventString();
@@ -111,13 +111,12 @@ void AnnounceListTest::testSingleElementList() {
 
 void AnnounceListTest::testMultiElementList() {
   std::string peersString = "ll8:tracker18:tracker28:tracker3ee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1, tracker2, tracker3 ] ]
   AnnounceList announceList(toVector(downcast<List>(announcesList)));
-  
+
   CPPUNIT_ASSERT(!announceList.allTiersFailed());
   std::string url = announceList.getAnnounce();
   CPPUNIT_ASSERT_EQUAL(std::string("tracker1"), url);
@@ -145,8 +144,7 @@ void AnnounceListTest::testMultiElementList() {
 
 void AnnounceListTest::testSingleAndMulti() {
   std::string peersString = "ll8:tracker18:tracker2el8:tracker3ee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1, tracker2 ], [ tracker3 ] ]
@@ -172,16 +170,14 @@ void AnnounceListTest::testSingleAndMulti() {
 
 void AnnounceListTest::testNoGroup() {
   std::string peersString = "llee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
   AnnounceList announceList(toVector(downcast<List>(announcesList)));
   CPPUNIT_ASSERT(announceList.countTier() == 0);
 }
 
 void AnnounceListTest::testNextEventIfAfterStarted() {
   std::string peersString = "ll8:tracker1ee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ] ]
@@ -201,8 +197,7 @@ void AnnounceListTest::testNextEventIfAfterStarted() {
 
 void AnnounceListTest::testEvent() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
@@ -226,8 +221,7 @@ void AnnounceListTest::testEvent() {
 
 void AnnounceListTest::testCountStoppedAllowedTier() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
@@ -254,8 +248,7 @@ void AnnounceListTest::testCountStoppedAllowedTier() {
 
 void AnnounceListTest::testCountCompletedAllowedTier() {
   std::string peersString = "ll8:tracker1el8:tracker2el8:tracker3ee";
-  SharedHandle<ValueBase> announcesList =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> announcesList = bencode2::decode(peersString);
 
   // ANNOUNCE_LIST
   // [ [ tracker1 ], [ tracker2 ], [ tracker3 ] ]
diff --git a/test/Bencode2Test.cc b/test/Bencode2Test.cc
index 88b0e5eb..5916bd76 100644
--- a/test/Bencode2Test.cc
+++ b/test/Bencode2Test.cc
@@ -9,191 +9,16 @@ namespace aria2 {
 class Bencode2Test:public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(Bencode2Test);
-  CPPUNIT_TEST(testDecode);
-  CPPUNIT_TEST(testDecode_overflow);
   CPPUNIT_TEST(testEncode);
   CPPUNIT_TEST_SUITE_END();
 private:
 
 public:
-  void testDecode();
-  void testDecode_overflow();
   void testEncode();
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( Bencode2Test );
 
-void Bencode2Test::testDecode()
-{
-  {
-    // string, integer and list in dict
-    std::string src = "d4:name5:aria24:sizei12345678900e5:filesl3:bin3:docee";
-    SharedHandle<ValueBase> r = bencode2::decode(src.begin(), src.end());
-    const Dict* dict = downcast<Dict>(r);
-    CPPUNIT_ASSERT(dict);
-    CPPUNIT_ASSERT_EQUAL(std::string("aria2"),
-                         downcast<String>(dict->get("name"))->s());
-    CPPUNIT_ASSERT_EQUAL(static_cast<Integer::ValueType>(12345678900LL),
-                         downcast<Integer>(dict->get("size"))->i());
-    const List* list = downcast<List>(dict->get("files"));
-    CPPUNIT_ASSERT(list);
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), list->size());
-    CPPUNIT_ASSERT_EQUAL(std::string("bin"),
-                         downcast<String>(list->get(0))->s());
-    CPPUNIT_ASSERT_EQUAL(std::string("doc"),
-                         downcast<String>(list->get(1))->s());
-  }
-  {
-    // dict in list
-    std::string src = "ld1:ki123eee";
-    SharedHandle<ValueBase> r = bencode2::decode(src.begin(), src.end());
-    const List* list = downcast<List>(r);
-    CPPUNIT_ASSERT(list);
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), list->size());
-    const Dict* dict = downcast<Dict>(list->get(0));
-    CPPUNIT_ASSERT(dict);
-    CPPUNIT_ASSERT_EQUAL(static_cast<Integer::ValueType>(123),
-                         downcast<Integer>(dict->get("k"))->i());
-  }
-  {
-    // empty key is allowed
-    std::string src = "d0:1:ve";
-    SharedHandle<ValueBase> s = bencode2::decode(src.begin(), src.end());
-  }
-  {
-    // empty string
-    std::string src = "0:";
-    SharedHandle<ValueBase> s = bencode2::decode(src.begin(), src.end());
-    CPPUNIT_ASSERT_EQUAL(std::string(""), downcast<String>(s)->s());
-  }
-  {
-    // empty dict
-    std::string src = "de";
-    SharedHandle<ValueBase> d = bencode2::decode(src.begin(), src.end());
-    CPPUNIT_ASSERT(downcast<Dict>(d)->empty());
-  }
-  {
-    // empty list
-    std::string src = "le";
-    SharedHandle<ValueBase> l = bencode2::decode(src.begin(), src.end());
-    CPPUNIT_ASSERT(downcast<List>(l)->empty());
-  }
-  {
-    // integer, without ending 'e'
-    std::string src = "i3";
-    try {
-      bencode2::decode(src.begin(), src.end());
-      CPPUNIT_FAIL("exception must be thrown.");
-    } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Bencode decoding failed:"
-                                       " Integer expected but none found"),
-                           std::string(e.what()));
-    }    
-  }
-  {
-    // dict, without ending 'e'
-    std::string src = "d";
-    try {
-      bencode2::decode(src.begin(), src.end());
-      CPPUNIT_FAIL("exception must be thrown.");
-    } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Bencode decoding failed:"
-                                       " Unexpected EOF in dict context."
-                                       " 'e' expected."),
-                           std::string(e.what()));
-    }          
-  }
-  {
-    // list, without ending 'e'
-    try {
-      std::string src = "l";
-      bencode2::decode(src.begin(), src.end());
-      CPPUNIT_FAIL("exception must be thrown.");
-    } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Bencode decoding failed:"
-                                       " Unexpected EOF in list context."
-                                       " 'e' expected."),
-                           std::string(e.what()));
-    }          
-  }
-  {
-    // string, less than the specified length.
-    try {
-      std::string src = "3:ab";
-      bencode2::decode(src.begin(), src.end());
-      CPPUNIT_FAIL("exception must be thrown.");
-    } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Bencode decoding failed:"
-                                       " Expected 3 bytes of data,"
-                                       " but only 2 read."),
-                           std::string(e.what()));
-    }
-  }
-  {
-    // string, but length is invalid
-    try {
-      std::string src = "x:abc";
-      bencode2::decode(src.begin(), src.end());
-      CPPUNIT_FAIL("exception must be thrown.");
-    } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Bencode decoding failed:"
-                                       " A positive integer expected"
-                                       " but none found."),
-                           std::string(e.what()));
-    }
-  }
-  {
-    // string with minus length
-    std::string src = "-1:a";
-    try {
-      bencode2::decode(src.begin(), src.end());
-      CPPUNIT_FAIL("exception must be thrown.");
-    } catch(RecoverableException& e) {
-      CPPUNIT_ASSERT_EQUAL(std::string("Bencode decoding failed:"
-                                       " A positive integer expected"
-                                       " but none found."),
-                           std::string(e.what()));
-    }
-  }
-  {
-    // empty encoded data
-    std::string src = "";
-    CPPUNIT_ASSERT(!bencode2::decode(src.begin(), src.end()));
-  }
-  {
-    // ignore trailing garbage at the end of the input.
-    std::string src = "5:aria2trail";
-    SharedHandle<ValueBase> s = bencode2::decode(src.begin(), src.end());
-    CPPUNIT_ASSERT_EQUAL(std::string("aria2"), downcast<String>(s)->s());
-  }
-  {
-    // Get trailing garbage position
-    std::string src = "5:aria2trail";
-    size_t end;
-    SharedHandle<ValueBase> s = bencode2::decode(src.begin(), src.end(), end);
-    CPPUNIT_ASSERT_EQUAL(std::string("aria2"), downcast<String>(s)->s());
-    CPPUNIT_ASSERT_EQUAL((size_t)7, end);
-  }
-}
-
-void Bencode2Test::testDecode_overflow()
-{
-  std::string s;
-  size_t depth = bencode2::MAX_STRUCTURE_DEPTH+1;
-  for(size_t i = 0; i < depth; ++i) {
-    s += "l";
-  }
-  for(size_t i = 0; i < depth; ++i) {
-    s += "e";
-  }
-  try {
-    bencode2::decode(s.begin(), s.end());
-    CPPUNIT_FAIL("exception must be thrown.");
-  } catch(RecoverableException& e) {
-    // success
-  }
-}
-
 void Bencode2Test::testEncode()
 {
   {
diff --git a/test/BittorrentHelperTest.cc b/test/BittorrentHelperTest.cc
index 248ff869..bbfa90d1 100644
--- a/test/BittorrentHelperTest.cc
+++ b/test/BittorrentHelperTest.cc
@@ -746,8 +746,7 @@ void BittorrentHelperTest::testMetadata() {
   SharedHandle<DownloadContext> dctx(new DownloadContext());
   load(A2_TEST_DIR"/test.torrent", dctx, option_);
   std::string torrentData = readFile(A2_TEST_DIR"/test.torrent");
-  SharedHandle<ValueBase> tr =
-    bencode2::decode(torrentData.begin(), torrentData.end());
+  SharedHandle<ValueBase> tr = bencode2::decode(torrentData);
   SharedHandle<ValueBase> infoDic = downcast<Dict>(tr)->get("info");
   std::string metadata = bencode2::encode(infoDic);
   SharedHandle<TorrentAttribute> attrs = getTorrentAttrs(dctx);
@@ -831,8 +830,7 @@ void BittorrentHelperTest::testExtractPeerFromString()
   std::string hextext = "100210354527354678541237324732171ae1";
   hextext += "20010db8bd0501d2288a1fc0000110ee1ae2";
   std::string peersstr = "36:"+fromHex(hextext);
-  SharedHandle<ValueBase> str =
-    bencode2::decode(peersstr.begin(), peersstr.end());
+  SharedHandle<ValueBase> str = bencode2::decode(peersstr);
   std::deque<SharedHandle<Peer> > peers;
   extractPeer(str, AF_INET6, std::back_inserter(peers));
   CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size());
@@ -846,14 +844,14 @@ void BittorrentHelperTest::testExtractPeerFromString()
   hextext = "c0a800011ae1";
   hextext += "c0a800021ae2";
   peersstr = "12:"+fromHex(hextext);
-  str = bencode2::decode(peersstr.begin(), peersstr.end());
+  str = bencode2::decode(peersstr);
   peers.clear();
   extractPeer(str, AF_INET, std::back_inserter(peers));
   CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size());
   CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peers[0]->getIPAddress());
   CPPUNIT_ASSERT_EQUAL((uint16_t)6881, peers[0]->getPort());
   CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->getIPAddress());
-  CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->getPort()); 
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->getPort());
 }
 
 void BittorrentHelperTest::testExtractPeerFromList()
@@ -862,9 +860,8 @@ void BittorrentHelperTest::testExtractPeerFromList()
     "d5:peersld2:ip11:192.168.0.17:peer id20:aria2-00000000000000"
     "4:porti2006eeee";
 
-  SharedHandle<ValueBase> dict =
-    bencode2::decode(peersString.begin(), peersString.end());
-  
+  SharedHandle<ValueBase> dict = bencode2::decode(peersString);
+
   std::deque<SharedHandle<Peer> > peers;
   extractPeer(downcast<Dict>(dict)->get("peers"), AF_INET, std::back_inserter(peers));
   CPPUNIT_ASSERT_EQUAL((size_t)1, peers.size());
@@ -880,8 +877,7 @@ void BittorrentHelperTest::testExtract2PeersFromList()
     "4:porti65535eed2:ip11:192.168.0.27:peer id20:aria2-00000000000000"
     "4:porti2007eeee";
 
-  SharedHandle<ValueBase> dict =
-    bencode2::decode(peersString.begin(), peersString.end());
+  SharedHandle<ValueBase> dict = bencode2::decode(peersString);
 
   std::deque<SharedHandle<Peer> > peers;
   extractPeer(downcast<Dict>(dict)->get("peers"), AF_INET, std::back_inserter(peers));