premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix typo in client.py. introduce parse_magnet_uri_dict to python binding (returning a dict) in preparation for next major version that will release an add_torrent_params object

This commit is contained in:
Arvid Norberg 2018-04-28 16:47:43 +02:00 committed by Arvid Norberg
parent f5e33932d2
commit 747fcb633a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/python/client.py
View File

@ -146,7 +146,7 @@ def print_download_queue(console, download_queue):
def add_torrent(ses, filename, options):
atp = {}
if filename.startswith('magnet:'):
atp = lt.parse_magnet_uti(filename)
atp = lt.parse_magnet_uri_dict(filename)
else:
atp['ti'] = lt.torrent_info(filename)
try:

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

@ -37,7 +37,7 @@ namespace {
}
#endif
dict parse_magnet_uri_wrap(std::string const& uri)
dict parse_magnet_uri_dict(std::string const& uri)
{
add_torrent_params p;
error_code ec;
@ -81,6 +81,7 @@ void bind_magnet_uri()
#endif
def("make_magnet_uri", make_magnet_uri0);
def("make_magnet_uri", make_magnet_uri1);
def("parse_magnet_uri", parse_magnet_uri_wrap);
def("parse_magnet_uri", parse_magnet_uri_dict);
def("parse_magnet_uri_dict", parse_magnet_uri_dict);
}

10
bindings/python/test.py
View File

@ -305,6 +305,16 @@ class test_magnet_link(unittest.TestCase):
ses = lt.session({})
magnet = 'magnet:?xt=urn:btih:C6EIF4CCYDBTIJVG3APAGM7M4NDONCTI'
p = lt.parse_magnet_uri(magnet)
self.assertEqual(binascii.hexlify(p['info_hash']), '178882f042c0c33426a6d81e0333ece346e68a68')
p['save_path'] = '.'
h = ses.add_torrent(p)
self.assertEqual(str(h.info_hash()), '178882f042c0c33426a6d81e0333ece346e68a68')
def test_parse_magnet_uri_dict(self):
ses = lt.session({})
magnet = 'magnet:?xt=urn:btih:C6EIF4CCYDBTIJVG3APAGM7M4NDONCTI'
p = lt.parse_magnet_uri_dict(magnet)
self.assertEqual(binascii.hexlify(p['info_hash']), '178882f042c0c33426a6d81e0333ece346e68a68')
p['save_path'] = '.'
h = ses.add_torrent(p)
self.assertEqual(str(h.info_hash()), '178882f042c0c33426a6d81e0333ece346e68a68')