wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

make parse_magnet_uri return the add_torrent_params instead of of taking an in-out parameter

This commit is contained in:
arvidn 2017-10-14 16:40:48 +02:00 committed by Arvid Norberg
parent 762ae9aec4
commit a6c85496b5
10 changed files with 80 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/python/src/magnet_uri.cpp
View File

@ -39,9 +39,8 @@ namespace {
dict parse_magnet_uri_wrap(std::string const& uri)
{
add_torrent_params p;
error_code ec;
parse_magnet_uri(uri, p, ec);
add_torrent_params p = parse_magnet_uri(uri, ec);
if (ec) throw system_error(ec);

3
examples/bt-get.cpp
View File

@ -48,9 +48,8 @@ int main(int argc, char const* argv[])
}
lt::session ses;
lt::add_torrent_params atp;
lt::error_code ec;
lt::parse_magnet_uri(argv[1], atp, ec);
lt::add_torrent_params atp = lt::parse_magnet_uri(argv[1], ec);
if (ec) {
std::cerr << "invalid magnet URI: " << ec.message() << std::endl;
return 1;

5
examples/bt-get2.cpp
View File

@ -91,7 +91,10 @@ int main(int argc, char const* argv[])
std::cerr << "failed to read resume data: " << ec.message() << std::endl;
return 1;
}
lt::parse_magnet_uri(argv[1], atp, ec);
lt::add_torrent_params magnet = lt::parse_magnet_uri(argv[1], ec);
if (atp.info_hash != magnet.info_hash) {
atp = std::move(magnet);
}
if (ec) {
std::cerr << "invalid magnet URI: " << ec.message() << std::endl;
return 1;

4
examples/client_test.cpp
View File

@ -515,9 +515,8 @@ std::string resume_file(lt::sha1_hash const& info_hash)
void add_magnet(lt::session& ses, lt::string_view uri)
{
lt::add_torrent_params p;
lt::error_code ec;
lt::parse_magnet_uri(uri.to_string(), p, ec);
lt::add_torrent_params p = lt::parse_magnet_uri(uri.to_string(), ec);
if (ec)
{
@ -531,7 +530,6 @@ void add_magnet(lt::session& ses, lt::string_view uri)
{
p = lt::read_resume_data(resume_data, ec);
if (ec) std::printf(" failed to load resume data: %s\n", ec.message().c_str());
parse_magnet_uri(uri.to_string(), p, ec);
}
ec.clear();

4
include/libtorrent/magnet_uri.hpp
View File

@ -74,11 +74,13 @@ namespace libtorrent {
torrent_handle add_magnet_uri(session& ses, std::string const& uri
, add_torrent_params p, error_code& ec);
// deprecated in 1.2
TORRENT_DEPRECATED_EXPORT void parse_magnet_uri(string_view uri, add_torrent_params& p, error_code& ec);
#endif
// This function parses out information from the magnet link and populates the
// add_torrent_params object.
TORRENT_EXPORT void parse_magnet_uri(string_view uri, add_torrent_params& p, error_code& ec);
TORRENT_EXPORT add_torrent_params parse_magnet_uri(string_view uri, error_code& ec);
}
#endif

12
simulation/test_metadata_extension.cpp
View File

@ -100,8 +100,18 @@ void run_metadata_test(int flags)
, [](lt::add_torrent_params& params) {
// we want to add the torrent via magnet link
error_code ec;
parse_magnet_uri(lt::make_magnet_uri(*params.ti), params, ec);
add_torrent_params const p = parse_magnet_uri(
lt::make_magnet_uri(*params.ti), ec);
TEST_CHECK(!ec);
params.name = p.name;
params.trackers = p.trackers;
params.tracker_tiers = p.tracker_tiers;
params.url_seeds = p.url_seeds;
params.info_hash = p.info_hash;
params.peers = p.peers;
#ifndef TORRENT_DISABLE_DHT
params.dht_nodes = p.dht_nodes;
#endif
params.ti.reset();
params.flags &= ~torrent_flags::upload_mode;
}

20
src/magnet_uri.cpp
View File

@ -165,10 +165,17 @@ namespace libtorrent {
return ret;
}
#endif // BOOST_NO_EXCEPTIONS
#endif // TORRENT_NO_DEPRECATE
void parse_magnet_uri(string_view uri, add_torrent_params& p, error_code& ec)
{
p = parse_magnet_uri(uri, ec);
}
#endif // TORRENT_NO_DEPRECATE
add_torrent_params parse_magnet_uri(string_view uri, error_code& ec)
{
add_torrent_params p;
ec.clear();
std::string name;
@ -221,18 +228,18 @@ namespace libtorrent {
if (btih.empty())
{
ec = errors::missing_info_hash_in_uri;
return;
return p;
}
if (btih.find('%') != string_view::npos)
{
unescaped_btih = unescape_string(btih, ec);
if (ec) return;
if (ec) return p;
btih = unescaped_btih;
}
if (btih.substr(0, 9) != "urn:btih:")
{
ec = errors::missing_info_hash_in_uri;
return;
return p;
}
std::string::size_type peer_pos = std::string::npos;
@ -278,17 +285,18 @@ namespace libtorrent {
if (ih.size() != 20)
{
ec = errors::invalid_info_hash;
return;
return p;
}
info_hash.assign(ih);
}
else
{
ec = errors::invalid_info_hash;
return;
return p;
}
p.info_hash = info_hash;
if (!name.empty()) p.name = name;
return p;
}
}

3
src/torrent_info.cpp
View File

@ -1249,8 +1249,7 @@ namespace {
{
auto uri = link.string_value();
add_torrent_params p;
parse_magnet_uri(uri.to_string(), p, ec);
add_torrent_params p = parse_magnet_uri(uri.to_string(), ec);
if (ec) return false;
m_info_hash = p.info_hash;

90
test/test_magnet.cpp
View File

@ -110,19 +110,19 @@ TORRENT_TEST(magnet)
s->save_state(session_state);
// test magnet link parsing
add_torrent_params model;
model.flags &= ~torrent_flags::paused;
model.flags &= ~torrent_flags::auto_managed;
model.save_path = ".";
error_code ec;
add_torrent_params p = model;
parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&tr=http://1"
"&tr=http://2"
"&tr=http://3"
"&tr=http://3"
"&dn=foo"
"&dht=127.0.0.1:43", p, ec);
"&dht=127.0.0.1:43", ec);
p.flags &= ~torrent_flags::paused;
p.flags &= ~torrent_flags::auto_managed;
p.save_path = ".";
TEST_CHECK(!ec);
torrent_handle t = s->add_torrent(p, ec);
TEST_CHECK(!ec);
@ -139,14 +139,16 @@ TORRENT_TEST(magnet)
TEST_CHECK(trackers_set.count("http://2") == 1);
TEST_CHECK(trackers_set.count("http://3") == 1);
p = model;
parse_magnet_uri("magnet:"
p = parse_magnet_uri("magnet:"
"?tr=http://1"
"&tr=http://2"
"&dn=foo"
"&dht=127.0.0.1:43"
"&xt=urn:btih:c352cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd", p, ec);
"&xt=urn:btih:c352cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd", ec);
TEST_CHECK(!ec);
p.flags &= ~torrent_flags::paused;
p.flags &= ~torrent_flags::auto_managed;
p.save_path = ".";
torrent_handle t2 = s->add_torrent(p, ec);
TEST_CHECK(!ec);
if (ec) std::printf("%s\n", ec.message().c_str());
@ -156,14 +158,16 @@ TORRENT_TEST(magnet)
TEST_EQUAL(trackers[0].tier, 0);
TEST_EQUAL(trackers[1].tier, 1);
p = model;
parse_magnet_uri("magnet:"
p = parse_magnet_uri("magnet:"
"?tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80"
"&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80"
"&tr=udp%3A%2F%2Ftracker.ccc.de%3A80"
"&xt=urn:btih:a38d02c287893842a32825aa866e00828a318f07"
"&dn=Ubuntu+11.04+%28Final%29", p, ec);
"&dn=Ubuntu+11.04+%28Final%29", ec);
TEST_CHECK(!ec);
p.flags &= ~torrent_flags::paused;
p.flags &= ~torrent_flags::auto_managed;
p.save_path = ".";
torrent_handle t3 = s->add_torrent(p, ec);
TEST_CHECK(!ec);
if (ec) std::printf("%s\n", ec.message().c_str());
@ -226,8 +230,7 @@ TORRENT_TEST(magnet)
TORRENT_TEST(parse_escaped_hash_parameter)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn%3Abtih%3Acdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn%3Abtih%3Acdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd", ec);
TEST_CHECK(!ec);
TEST_EQUAL(aux::to_hex(p.info_hash), "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd");
}
@ -235,8 +238,7 @@ TORRENT_TEST(parse_escaped_hash_parameter)
TORRENT_TEST(parse_escaped_hash_parameter_in_hex)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc%64", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdc%64", ec);
TEST_CHECK(!ec);
TEST_EQUAL(aux::to_hex(p.info_hash), "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd");
}
@ -244,8 +246,7 @@ TORRENT_TEST(parse_escaped_hash_parameter_in_hex)
TORRENT_TEST(parse_invalid_escaped_hash_parameter)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn%%3A", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn%%3A", ec);
TEST_EQUAL(ec, error_code(errors::invalid_escaped_string));
}
@ -253,8 +254,7 @@ TORRENT_TEST(parse_missing_hash)
{
// parse_magnet_uri
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?dn=foo&dht=127.0.0.1:43", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?dn=foo&dht=127.0.0.1:43", ec);
TEST_EQUAL(ec, error_code(errors::missing_info_hash_in_uri));
ec.clear();
}
@ -263,8 +263,7 @@ TORRENT_TEST(parse_base32_hash)
{
// parse_magnet_uri
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:MFRGCYTBMJQWEYLCMFRGCYTBMJQWEYLC", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:MFRGCYTBMJQWEYLCMFRGCYTBMJQWEYLC", ec);
TEST_CHECK(!ec);
TEST_EQUAL(p.info_hash, sha1_hash("abababababababababab"));
ec.clear();
@ -274,9 +273,8 @@ TORRENT_TEST(parse_web_seeds)
{
// parse_magnet_uri
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&ws=http://foo.com/bar&ws=http://bar.com/foo", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&ws=http://foo.com/bar&ws=http://bar.com/foo", ec);
TEST_CHECK(!ec);
TEST_EQUAL(p.url_seeds.size(), 2);
TEST_EQUAL(p.url_seeds[0], "http://foo.com/bar");
@ -287,8 +285,7 @@ TORRENT_TEST(parse_web_seeds)
TORRENT_TEST(parse_missing_hash2)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=blah&dn=foo&dht=127.0.0.1:43", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=blah&dn=foo&dht=127.0.0.1:43", ec);
TEST_EQUAL(ec, error_code(errors::missing_info_hash_in_uri));
ec.clear();
}
@ -296,8 +293,7 @@ TORRENT_TEST(parse_missing_hash2)
TORRENT_TEST(parse_short_hash)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:abababab", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:abababab", ec);
TEST_EQUAL(ec, error_code(errors::invalid_info_hash));
ec.clear();
}
@ -305,8 +301,7 @@ TORRENT_TEST(parse_short_hash)
TORRENT_TEST(parse_long_hash)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:ababababababababababab", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:ababababababababababab", ec);
TEST_EQUAL(ec, error_code(errors::invalid_info_hash));
ec.clear();
}
@ -314,8 +309,7 @@ TORRENT_TEST(parse_long_hash)
TORRENT_TEST(parse_space_hash)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih: abababababababababab", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih: abababababababababab", ec);
TEST_EQUAL(ec, error_code(errors::invalid_info_hash));
ec.clear();
}
@ -323,9 +317,8 @@ TORRENT_TEST(parse_space_hash)
TORRENT_TEST(parse_peer)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&dn=foo&x.pe=127.0.0.1:43&x.pe=<invalid1>&x.pe=<invalid2>:100&x.pe=[::1]:45", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&dn=foo&x.pe=127.0.0.1:43&x.pe=<invalid1>&x.pe=<invalid2>:100&x.pe=[::1]:45", ec);
TEST_CHECK(!ec);
#if TORRENT_USE_IPV6
TEST_EQUAL(p.peers.size(), 2);
@ -342,9 +335,8 @@ TORRENT_TEST(parse_peer)
TORRENT_TEST(parse_dht_node)
{
error_code ec;
add_torrent_params p;
parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&dn=foo&dht=127.0.0.1:43&dht=10.0.0.1:1337", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd"
"&dn=foo&dht=127.0.0.1:43&dht=10.0.0.1:1337", ec);
TEST_CHECK(!ec);
if (ec) std::printf("%s\n", ec.message().c_str());
ec.clear();
@ -447,16 +439,16 @@ TORRENT_TEST(make_magnet_uri2)
TORRENT_TEST(trailing_whitespace)
{
session ses(settings());
add_torrent_params p;
p.save_path = ".";
error_code ec;
parse_magnet_uri("magnet:?xt=urn:btih:abaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?xt=urn:btih:abaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n", ec);
p.save_path = ".";
// invalid hash
TEST_CHECK(ec);
TEST_THROW(ses.add_torrent(p));
ec.clear();
parse_magnet_uri("magnet:?xt=urn:btih:abaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", p, ec);
p = parse_magnet_uri("magnet:?xt=urn:btih:abaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", ec);
p.save_path = ".";
TEST_CHECK(!ec);
// now it's valid, because there's no trailing whitespace
torrent_handle h = ses.add_torrent(p);
@ -465,21 +457,17 @@ TORRENT_TEST(trailing_whitespace)
TORRENT_TEST(invalid_tracker_escaping)
{
add_torrent_params p;
p.save_path = ".";
error_code ec;
parse_magnet_uri("magnet:?tr=udp%3A%2F%2Ftracker.openjnt.com%\xf7"
add_torrent_params p = parse_magnet_uri("magnet:?tr=udp%3A%2F%2Ftracker.openjnt.com%\xf7"
"A80&tr=udp%3A%2F%2Ftracker.pub.ciltbcom%3A80&tr=udp%3A%2F%2Ftracker.ccc.de%3A80&xt=urn:btih:a38d02c287893842a39737aa866e00828aA80&xt=urn:buntu+11.04+%28Final%29"
, p, ec);
, ec);
TEST_CHECK(ec);
}
TORRENT_TEST(invalid_web_seed_escaping)
{
add_torrent_params p;
p.save_path = ".";
error_code ec;
parse_magnet_uri("magnet:?ws=udp%3A%2F%2Ftracker.openjnt.com%\xf7" "A80", p, ec);
add_torrent_params p = parse_magnet_uri("magnet:?ws=udp%3A%2F%2Ftracker.openjnt.com%\xf7" "A80", ec);
TEST_CHECK(ec);
}

11
test/test_torrent.cpp
View File

@ -235,11 +235,11 @@ TORRENT_TEST(added_peers)
pack.set_int(settings_pack::max_retry_port_bind, 10);
lt::session ses(pack);
add_torrent_params p;
add_torrent_params p = parse_magnet_uri(
"magnet:?xt=urn:btih:abababababababababababababababababababab&x.pe=127.0.0.1:48081&x.pe=127.0.0.2:48082"
, ec);
p.ti = info;
p.save_path = ".";
parse_magnet_uri("magnet:?xt=urn:btih:abababababababababababababababababababab&x.pe=127.0.0.1:48081&x.pe=127.0.0.2:48082"
, p, ec);
TEST_CHECK(!ec);
torrent_handle h = ses.add_torrent(std::move(p));
@ -577,10 +577,9 @@ TORRENT_TEST(queue_paused)
TORRENT_TEST(test_move_storage_no_metadata)
{
lt::session ses(settings());
add_torrent_params p;
p.save_path = "save_path";
error_code ec;
parse_magnet_uri("magnet?xt=urn:btih:abababababababababababababababababababab", p, ec);
add_torrent_params p = parse_magnet_uri("magnet?xt=urn:btih:abababababababababababababababababababab", ec);
p.save_path = "save_path";
torrent_handle h = ses.add_torrent(p);
TEST_EQUAL(h.status().save_path, complete("save_path"));