github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-11-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Prepended "[METADATA]" before dn.
	* src/bittorrent_helper.cc
	* test/BittorrentHelperTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-11-24 16:39:52 +00:00
parent 512be58217
commit 656cbd16a0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bittorrent_helper.cc
View File

@ -883,11 +883,11 @@ BDE parseMagnet(const std::string& magnet)
if(r.containsKey("tr")) { if(r.containsKey("tr")) {
announceList << r["tr"]; announceList << r["tr"];
} }
std::string name; std::string name = "[METADATA]";
if(r.containsKey("dn") && r["dn"].size()) { if(r.containsKey("dn") && r["dn"].size()) {
name = r["dn"][0].s(); name += r["dn"][0].s();
} else { } else {
name = strconcat("[METADATA]", util::toHex(infoHash)); name += util::toHex(infoHash);
} }
BDE attrs = BDE::dict(); BDE attrs = BDE::dict();
attrs[INFO_HASH] = infoHash; attrs[INFO_HASH] = infoHash;

3
test/BittorrentHelperTest.cc
View File

@ -708,7 +708,8 @@ void BittorrentHelperTest::testParseMagnet()
BDE attrs = bittorrent::parseMagnet(magnet); BDE attrs = bittorrent::parseMagnet(magnet);
CPPUNIT_ASSERT_EQUAL(std::string("248d0a1cd08284299de78d5c1ed359bb46717d8c"), CPPUNIT_ASSERT_EQUAL(std::string("248d0a1cd08284299de78d5c1ed359bb46717d8c"),
util::toHex(attrs[bittorrent::INFO_HASH].s())); util::toHex(attrs[bittorrent::INFO_HASH].s()));
CPPUNIT_ASSERT_EQUAL(std::string("aria2"), attrs[bittorrent::NAME].s()); CPPUNIT_ASSERT_EQUAL(std::string("[METADATA]aria2"),
attrs[bittorrent::NAME].s());
CPPUNIT_ASSERT_EQUAL(std::string("http://tracker1"), CPPUNIT_ASSERT_EQUAL(std::string("http://tracker1"),
attrs[bittorrent::ANNOUNCE_LIST][0][0].s()); attrs[bittorrent::ANNOUNCE_LIST][0][0].s());
CPPUNIT_ASSERT_EQUAL(std::string("http://tracker2"), CPPUNIT_ASSERT_EQUAL(std::string("http://tracker2"),