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

Fixup python code in bindings to pass PEP8 codestyle 

* Passes Flake8 default settings.
 * Tabs replace spaces
 * Ensure print_function available for python2
This commit is contained in:
Calum Lind 2017-01-20 15:07:09 +00:00 committed by Arvid Norberg
parent c4c80b59d5
commit d32ed4b9de
6 changed files with 456 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
bindings/python/client.py
View File

@ -3,13 +3,14 @@
# Copyright Daniel Wallin 2006. Use, modification and distribution is # Copyright Daniel Wallin 2006. Use, modification and distribution is
# subject to the Boost Software License, Version 1.0. (See accompanying # subject to the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
from __future__ import print_function
import sys import sys
import atexit import atexit
import libtorrent as lt import libtorrent as lt
import time import time
import os.path import os.path
import sys
class WindowsConsole: class WindowsConsole:
def __init__(self): def __init__(self):
@ -27,6 +28,7 @@ class WindowsConsole:
return msvcrt.getch() return msvcrt.getch()
return None return None
class UnixConsole: class UnixConsole:
def __init__(self): def __init__(self):
self.fd = sys.stdin self.fd = sys.stdin
@ -51,11 +53,13 @@ class UnixConsole:
sys.stdout.flush() sys.stdout.flush()
def sleep_and_input(self, seconds): def sleep_and_input(self, seconds):
read,_,_ = select.select([self.fd.fileno()], [], [], seconds) read, __, __ = select.select(
[self.fd.fileno()], [], [], seconds)
if len(read) > 0: if len(read) > 0:
return self.fd.read(1) return self.fd.read(1)
return None return None
if os.name == 'nt': if os.name == 'nt':
import Console import Console
import msvcrt import msvcrt
@ -63,9 +67,11 @@ else:
import termios import termios
import select import select
def write_line(console, line): def write_line(console, line):
console.write(line) console.write(line)
def add_suffix(val): def add_suffix(val):
prefix = ['B', 'kB', 'MB', 'GB', 'TB'] prefix = ['B', 'kB', 'MB', 'GB', 'TB']
for i in range(len(prefix)): for i in range(len(prefix)):
@ -78,14 +84,17 @@ def add_suffix(val):
return '%6.3gPB' % val return '%6.3gPB' % val
def progress_bar(progress, width): def progress_bar(progress, width):
assert(progress <= 1) assert(progress <= 1)
progress_chars = int(progress * width + 0.5) progress_chars = int(progress * width + 0.5)
return progress_chars * '#' + (width - progress_chars) * '-' return progress_chars * '#' + (width - progress_chars) * '-'
def print_peer_info(console, peers): def print_peer_info(console, peers):
out = ' down (total ) up (total ) q r flags block progress client\n' out = (' down (total ) up (total )'
' q r flags block progress client\n')
for p in peers: for p in peers:
@ -96,23 +105,36 @@ def print_peer_info(console, peers):
out += '%2d ' % p.download_queue_length out += '%2d ' % p.download_queue_length
out += '%2d ' % p.upload_queue_length out += '%2d ' % p.upload_queue_length
if p.flags & lt.peer_info.interesting: out += 'I' if p.flags & lt.peer_info.interesting:
else: out += '.' out += 'I'
if p.flags & lt.peer_info.choked: out += 'C' else:
else: out += '.' out += '.'
if p.flags & lt.peer_info.remote_interested: out += 'i' if p.flags & lt.peer_info.choked:
else: out += '.' out += 'C'
if p.flags & lt.peer_info.remote_choked: out += 'c' else:
else: out += '.' out += '.'
if p.flags & lt.peer_info.supports_extensions: out += 'e' if p.flags & lt.peer_info.remote_interested:
else: out += '.' out += 'i'
if p.flags & lt.peer_info.local_connection: out += 'l' else:
else: out += 'r' out += '.'
if p.flags & lt.peer_info.remote_choked:
out += 'c'
else:
out += '.'
if p.flags & lt.peer_info.supports_extensions:
out += 'e'
else:
out += '.'
if p.flags & lt.peer_info.local_connection:
out += 'l'
else:
out += 'r'
out += ' ' out += ' '
if p.downloading_piece_index >= 0: if p.downloading_piece_index >= 0:
assert(p.downloading_progress <= p.downloading_total) assert(p.downloading_progress <= p.downloading_total)
out += progress_bar(float(p.downloading_progress) / p.downloading_total, 15) out += progress_bar(float(p.downloading_progress) /
p.downloading_total, 15)
else: else:
out += progress_bar(0, 15) out += progress_bar(0, 15)
out += ' ' out += ' '
@ -136,7 +158,7 @@ def print_download_queue(console, download_queue):
out = "" out = ""
for e in download_queue: for e in download_queue:
out += '%4d: [' % e['piece_index']; out += '%4d: [' % e['piece_index']
for b in e['blocks']: for b in e['blocks']:
s = b['state'] s = b['state']
if s == 3: if s == 3:
@ -151,32 +173,36 @@ def print_download_queue(console, download_queue):
write_line(console, out) write_line(console, out)
def main(): def main():
from optparse import OptionParser from optparse import OptionParser
parser = OptionParser() parser = OptionParser()
parser.add_option('-p', '--port', parser.add_option('-p', '--port', type='int', help='set listening port')
type='int', help='set listening port')
parser.add_option('-d', '--max-download-rate', parser.add_option(
type='float', help='the maximum download rate given in kB/s. 0 means infinite.') '-d', '--max-download-rate', type='float',
help='the maximum download rate given in kB/s. 0 means infinite.')
parser.add_option('-u', '--max-upload-rate', parser.add_option(
type='float', help='the maximum upload rate given in kB/s. 0 means infinite.') '-u', '--max-upload-rate', type='float',
help='the maximum upload rate given in kB/s. 0 means infinite.')
parser.add_option('-s', '--save-path', parser.add_option(
type='string', help='the path where the downloaded file/folder should be placed.') '-s', '--save-path', type='string',
help='the path where the downloaded file/folder should be placed.')
parser.add_option('-r', '--proxy-host', parser.add_option(
type='string', help='sets HTTP proxy host and port (separated by \':\')') '-r', '--proxy-host', type='string',
help='sets HTTP proxy host and port (separated by \':\')')
parser.set_defaults( parser.set_defaults(
port=6881 port=6881,
, max_download_rate=0 max_download_rate=0,
, max_upload_rate=0 max_upload_rate=0,
, save_path='.' save_path='.',
, proxy_host='' proxy_host=''
) )
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
@ -220,14 +246,17 @@ def main():
atp["paused"] = False atp["paused"] = False
atp["auto_managed"] = True atp["auto_managed"] = True
atp["duplicate_is_error"] = True atp["duplicate_is_error"] = True
if f.startswith('magnet:') or f.startswith('http://') or f.startswith('https://'): if f.startswith('magnet:') or f.startswith(
'http://') or f.startswith('https://'):
atp["url"] = f atp["url"] = f
else: else:
info = lt.torrent_info(f) info = lt.torrent_info(f)
print('Adding \'%s\'...' % info.name()) print('Adding \'%s\'...' % info.name())
try: try:
atp["resume_data"] = open(os.path.join(options.save_path, info.name() + '.fastresume'), 'rb').read() atp["resume_data"] = open(os.path.join(
options.save_path,
info.name() + '.fastresume'), 'rb').read()
except: except:
pass pass
@ -261,8 +290,8 @@ def main():
s = h.status() s = h.status()
if s.state != lt.torrent_status.seeding: if s.state != lt.torrent_status.seeding:
state_str = ['queued', 'checking', 'downloading metadata', \ state_str = ['queued', 'checking', 'downloading metadata',
'downloading', 'finished', 'seeding', \ 'downloading', 'finished', 'seeding',
'allocating', 'checking fastresume'] 'allocating', 'checking fastresume']
out += state_str[s.state] + ' ' out += state_str[s.state] + ' '
@ -308,7 +337,8 @@ def main():
while 1: while 1:
a = ses.pop_alert() a = ses.pop_alert()
if not a: break if not a:
break
alerts.append(a) alerts.append(a)
if len(alerts) > 8: if len(alerts) > 8:
@ -326,20 +356,24 @@ def main():
continue continue
if c == 'r': if c == 'r':
for h in handles: h.force_reannounce() for h in handles:
h.force_reannounce()
elif c == 'q': elif c == 'q':
alive = False alive = False
elif c == 'p': elif c == 'p':
for h in handles: h.pause() for h in handles:
h.pause()
elif c == 'u': elif c == 'u':
for h in handles: h.resume() for h in handles:
h.resume()
ses.pause() ses.pause()
for h in handles: for h in handles:
if not h.is_valid() or not h.has_metadata(): if not h.is_valid() or not h.has_metadata():
continue continue
data = lt.bencode(h.write_resume_data()) data = lt.bencode(h.write_resume_data())
open(os.path.join(options.save_path, h.get_torrent_info().name() + '.fastresume'), 'wb').write(data) open(os.path.join(options.save_path, h.get_torrent_info().name() +
'.fastresume'), 'wb').write(data)
main() main()

13
bindings/python/make_torrent.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import sys import sys
import os import os
@ -21,19 +22,22 @@ parent_input = os.path.split(input)[0]
for root, dirs, files in os.walk(input): for root, dirs, files in os.walk(input):
# skip directories starting with . # skip directories starting with .
if os.path.split(root)[1][0] == '.': continue if os.path.split(root)[1][0] == '.':
continue
for f in files: for f in files:
# skip files starting with . # skip files starting with .
if f[0] == '.': continue if f[0] == '.':
continue
# skip thumbs.db on windows # skip thumbs.db on windows
if f == 'Thumbs.db': continue if f == 'Thumbs.db':
continue
fname = os.path.join(root[len(parent_input)+1:], f) fname = os.path.join(root[len(parent_input)+1:], f)
size = os.path.getsize(os.path.join(parent_input, fname)) size = os.path.getsize(os.path.join(parent_input, fname))
print('%10d kiB %s' % (size / 1024, fname)) print('%10d kiB %s' % (size / 1024, fname))
fs.add_file(fname, size); fs.add_file(fname, size)
if fs.num_files() == 0: if fs.num_files() == 0:
print('no files added') print('no files added')
@ -50,4 +54,3 @@ sys.stderr.write('\n')
f = open('out.torrent', 'wb+') f = open('out.torrent', 'wb+')
f.write(libtorrent.bencode(t.generate())) f.write(libtorrent.bencode(t.generate()))
f.close() f.close()

90
bindings/python/setup.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
from distutils.core import setup, Extension from distutils.core import setup, Extension
from distutils.sysconfig import get_config_vars from distutils.sysconfig import get_config_vars
@ -7,7 +8,7 @@ import platform
import sys import sys
import shutil import shutil
import multiprocessing import multiprocessing
import subprocess
class flags_parser: class flags_parser:
def __init__(self): def __init__(self):
@ -16,7 +17,11 @@ class flags_parser:
self.libraries = [] self.libraries = []
def parse(self, args): def parse(self, args):
"""Parse out the -I -L -l directives and return a list of all other arguments""" """Parse out the -I -L -l directives
Returns:
list: All other arguments
"""
ret = [] ret = []
for token in args.split(): for token in args.split():
prefix = token[:2] prefix = token[:2]
@ -30,98 +35,109 @@ class flags_parser:
ret.append(token) ret.append(token)
return ret return ret
def arch(): def arch():
if platform.system() != 'Darwin': return [] if platform.system() == 'Darwin':
a = os.uname()[4] __, __, machine = platform.mac_ver()
if a == 'Power Macintosh': a = 'ppc' if machine.startswith('ppc'):
return ['-arch', a] return ['-arch', machine]
return []
def target_specific(): def target_specific():
if platform.system() == 'Darwin':
if platform.system() != 'Darwin': return [] # On mavericks, clang will fail when unknown arguments are passed in.
# python distutils will pass in arguments it doesn't know about.
# on mavericks, clang will fail when unknown arguments are
# passed in. python distutils will pass in arguments it doesn't
# know about
return ['-Wno-error=unused-command-line-argument-hard-error-in-future'] return ['-Wno-error=unused-command-line-argument-hard-error-in-future']
return []
try: try:
with open('compile_flags') as _file: with open('compile_flags') as _file:
extra_cmd = _file.read() extra_cmd = _file.read()
except: except:
extra_cmd = None extra_cmd = None
try: try:
with open('link_flags') as _file: with open('link_flags') as _file:
ldflags = _file.read() ldflags = _file.read()
except: except:
ldflags = None ldflags = None
ext = None ext = None
packages = None packages = None
if '--bjam' in sys.argv:
if '--bjam' in sys.argv: if '--bjam' in sys.argv:
del sys.argv[sys.argv.index('--bjam')] del sys.argv[sys.argv.index('--bjam')]
if not '--help' in sys.argv \ if '--help' not in sys.argv and '--help-commands' not in sys.argv:
and not '--help-commands' in sys.argv:
file_ext = '.so'
if platform.system() == 'Windows': if platform.system() == 'Windows':
file_ext = '.pyd' file_ext = '.pyd'
else:
file_ext = '.so'
parallel_builds = ' -j%d' % multiprocessing.cpu_count() parallel_builds = ' -j%d' % multiprocessing.cpu_count()
# build libtorrent using bjam and build the installer with distutils # build libtorrent using bjam and build the installer with distutils
cmdline = 'b2 libtorrent-link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + parallel_builds cmdline = ('b2 libtorrent-link=static boost-link=static release '
'optimization=space stage_module --abbreviate-paths' +
parallel_builds)
print(cmdline) print(cmdline)
if os.system(cmdline) != 0: if os.system(cmdline) != 0:
print('build failed') print('build failed')
sys.exit(1) sys.exit(1)
try: os.mkdir('build') try:
except: pass os.mkdir('build')
try: shutil.rmtree('build/lib') except:
except: pass pass
try: os.mkdir('build/lib') try:
except: pass shutil.rmtree('build/lib')
try: os.mkdir('libtorrent') except:
except: pass pass
shutil.copyfile('libtorrent' + file_ext, 'build/lib/libtorrent' + file_ext) try:
os.mkdir('build/lib')
except:
pass
try:
os.mkdir('libtorrent')
except:
pass
shutil.copyfile('libtorrent' + file_ext,
'build/lib/libtorrent' + file_ext)
packages = ['libtorrent'] packages = ['libtorrent']
else: else:
# Remove the '-Wstrict-prototypes' compiler option, which isn't valid for C++. # Remove '-Wstrict-prototypes' compiler option, which isn't valid for C++.
cfg_vars = get_config_vars() cfg_vars = get_config_vars()
for key, value in cfg_vars.items(): for key, value in cfg_vars.items():
if isinstance(value, str): if isinstance(value, str):
cfg_vars[key] = value.replace('-Wstrict-prototypes', '') cfg_vars[key] = value.replace('-Wstrict-prototypes', '')
source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src")) source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src"))
source_list = [os.path.abspath(os.path.join(os.path.dirname(__file__), "src", s)) for s in source_list if s.endswith(".cpp")] source_list = [os.path.abspath(os.path.join(os.path.dirname(__file__),
"src", s)) for s in source_list if s.endswith(".cpp")]
if extra_cmd: if extra_cmd:
flags = flags_parser() flags = flags_parser()
# ldflags must be parsed first to ensure the correct library search path order # ldflags parsed first to ensure the correct library search path order
extra_link = flags.parse(ldflags) extra_link = flags.parse(ldflags)
extra_compile = flags.parse(extra_cmd) extra_compile = flags.parse(extra_cmd)
ext = [Extension('libtorrent', ext = [Extension(
'libtorrent',
sources=source_list, sources=source_list,
language='c++', language='c++',
include_dirs=flags.include_dirs, include_dirs=flags.include_dirs,
library_dirs=flags.library_dirs, library_dirs=flags.library_dirs,
extra_link_args=extra_link + arch(), extra_link_args=extra_link + arch(),
extra_compile_args=extra_compile + arch() + target_specific(), extra_compile_args=extra_compile + arch() + target_specific(),
libraries = ['torrent-rasterbar'] + flags.libraries)] libraries=['torrent-rasterbar'] + flags.libraries)
]
setup(name = 'python-libtorrent', setup(
name='python-libtorrent',
version='1.2.0', version='1.2.0',
author='Arvid Norberg', author='Arvid Norberg',
author_email='arvid@libtorrent.org', author_email='arvid@libtorrent.org',

10
bindings/python/simple_client.py
View File

@ -18,10 +18,12 @@ print('starting', h.name())
while (not h.is_seed()): while (not h.is_seed()):
s = h.status() s = h.status()
state_str = ['queued', 'checking', 'downloading metadata', \ state_str = [
'downloading', 'finished', 'seeding', 'allocating', 'checking fastresume'] 'queued', 'checking', 'downloading metadata',
print('\r%.2f%% complete (down: %.1f kB/s up: %.1f kB/s peers: %d) %s' % \ 'downloading', 'finished', 'seeding', 'allocating',
(s.progress * 100, s.download_rate / 1000, s.upload_rate / 1000, \ 'checking fastresume']
print('\r%.2f%% complete (down: %.1f kB/s up: %.1f kB/s peers: %d) %s' % (
s.progress * 100, s.download_rate / 1000, s.upload_rate / 1000,
s.num_peers, state_str[s.state]), end=' ') s.num_peers, state_str[s.state]), end=' ')
alerts = ses.pop_alerts() alerts = ses.pop_alerts()

83
bindings/python/test.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import libtorrent as lt import libtorrent as lt
@ -8,6 +9,7 @@ import os
import shutil import shutil
import binascii import binascii
class test_create_torrent(unittest.TestCase): class test_create_torrent(unittest.TestCase):
def test_from_torrent_info(self): def test_from_torrent_info(self):
@ -22,11 +24,12 @@ class test_create_torrent(unittest.TestCase):
print(entry) print(entry)
self.assertEqual(content, file_content) self.assertEqual(content, file_content)
class test_session_stats(unittest.TestCase): class test_session_stats(unittest.TestCase):
def test_unique(self): def test_unique(self):
l = lt.session_stats_metrics() l = lt.session_stats_metrics()
self.assertTrue(len(l) > 40); self.assertTrue(len(l) > 40)
idx = set() idx = set()
for m in l: for m in l:
self.assertTrue(m.value_index not in idx) self.assertTrue(m.value_index not in idx)
@ -35,12 +38,16 @@ class test_session_stats(unittest.TestCase):
def test_find_idx(self): def test_find_idx(self):
self.assertEqual(lt.find_metric_idx("peer.error_peers"), 0) self.assertEqual(lt.find_metric_idx("peer.error_peers"), 0)
class test_torrent_handle(unittest.TestCase): class test_torrent_handle(unittest.TestCase):
def setup(self): def setup(self):
self.ses = lt.session({'alert_mask': lt.alert.category_t.all_categories, 'enable_dht': False}) self.ses = lt.session({
self.ti = lt.torrent_info('url_seed_multi.torrent'); 'alert_mask': lt.alert.category_t.all_categories,
self.h = self.ses.add_torrent({'ti': self.ti, 'save_path': os.getcwd()}) 'enable_dht': False})
self.ti = lt.torrent_info('url_seed_multi.torrent')
self.h = self.ses.add_torrent({
'ti': self.ti, 'save_path': os.getcwd()})
def test_torrent_handle(self): def test_torrent_handle(self):
self.setup() self.setup()
@ -69,7 +76,7 @@ class test_torrent_handle(unittest.TestCase):
def test_torrent_status(self): def test_torrent_status(self):
self.setup() self.setup()
st = self.h.status() st = self.h.status()
ti = st.handle; ti = st.handle
self.assertEqual(ti.info_hash(), self.ti.info_hash()) self.assertEqual(ti.info_hash(), self.ti.info_hash())
# make sure we can compare torrent_status objects # make sure we can compare torrent_status objects
st2 = self.h.status() st2 = self.h.status()
@ -77,7 +84,8 @@ class test_torrent_handle(unittest.TestCase):
def test_read_resume_data(self): def test_read_resume_data(self):
resume_data = lt.bencode({'file-format': 'libtorrent resume file', resume_data = lt.bencode({
'file-format': 'libtorrent resume file',
'info-hash': 'abababababababababab', 'info-hash': 'abababababababababab',
'name': 'test', 'name': 'test',
'save_path': '.', 'save_path': '.',
@ -112,10 +120,12 @@ class test_torrent_handle(unittest.TestCase):
cs = self.ses.get_cache_info(self.h) cs = self.ses.get_cache_info(self.h)
self.assertEqual(cs.pieces, []) self.assertEqual(cs.pieces, [])
class test_torrent_info(unittest.TestCase): class test_torrent_info(unittest.TestCase):
def test_bencoded_constructor(self): def test_bencoded_constructor(self):
info = lt.torrent_info({ 'info': {'name': 'test_torrent', 'length': 1234, info = lt.torrent_info({'info': {
'name': 'test_torrent', 'length': 1234,
'piece length': 16 * 1024, 'piece length': 16 * 1024,
'pieces': 'aaaaaaaaaaaaaaaaaaaa'}}) 'pieces': 'aaaaaaaaaaaaaaaaaaaa'}})
@ -127,13 +137,13 @@ class test_torrent_info(unittest.TestCase):
self.assertEqual(info.total_size(), 1234) self.assertEqual(info.total_size(), 1234)
def test_metadata(self): def test_metadata(self):
ti = lt.torrent_info('base.torrent'); ti = lt.torrent_info('base.torrent')
self.assertTrue(len(ti.metadata()) != 0) self.assertTrue(len(ti.metadata()) != 0)
self.assertTrue(len(ti.hash_for_piece(0)) != 0) self.assertTrue(len(ti.hash_for_piece(0)) != 0)
def test_web_seeds(self): def test_web_seeds(self):
ti = lt.torrent_info('base.torrent'); ti = lt.torrent_info('base.torrent')
ws = [{'url': 'http://foo/test', 'auth': '', 'type': 0}, ws = [{'url': 'http://foo/test', 'auth': '', 'type': 0},
{'url': 'http://bar/test', 'auth': '', 'type': 1}] {'url': 'http://bar/test', 'auth': '', 'type': 1}]
@ -146,13 +156,14 @@ class test_torrent_info(unittest.TestCase):
self.assertEqual(web_seeds[i]["type"], ws[i]["type"]) self.assertEqual(web_seeds[i]["type"], ws[i]["type"])
def test_iterable_files(self): def test_iterable_files(self):
# this detects whether libtorrent was built with deprecated APIs # this detects whether libtorrent was built with deprecated APIs
# the file_strage object is only iterable for backwards compatibility # the file_strage object is only iterable for backwards compatibility
if not hasattr(lt, 'version'): return if not hasattr(lt, 'version'):
return
ses = lt.session({'alert_mask': lt.alert.category_t.all_categories, 'enable_dht': False}) lt.session({'alert_mask': lt.alert.category_t.all_categories,
ti = lt.torrent_info('url_seed_multi.torrent'); 'enable_dht': False})
ti = lt.torrent_info('url_seed_multi.torrent')
files = ti.files() files = ti.files()
idx = 0 idx = 0
@ -161,15 +172,18 @@ class test_torrent_info(unittest.TestCase):
print(f.path) print(f.path)
self.assertEqual(os.path.split(f.path)[1], expected[idx]) self.assertEqual(os.path.split(f.path)[1], expected[idx])
self.assertEqual(os.path.split(f.path)[0], os.path.join('temp', 'foo')) self.assertEqual(os.path.split(f.path)[0],
os.path.join('temp', 'foo'))
idx += 1 idx += 1
class test_alerts(unittest.TestCase): class test_alerts(unittest.TestCase):
def test_alert(self): def test_alert(self):
ses = lt.session({'alert_mask': lt.alert.category_t.all_categories, 'enable_dht': False}) ses = lt.session({'alert_mask': lt.alert.category_t.all_categories,
ti = lt.torrent_info('base.torrent'); 'enable_dht': False})
ti = lt.torrent_info('base.torrent')
h = ses.add_torrent({'ti': ti, 'save_path': os.getcwd()}) h = ses.add_torrent({'ti': ti, 'save_path': os.getcwd()})
st = h.status() st = h.status()
time.sleep(1) time.sleep(1)
@ -179,7 +193,8 @@ class test_alerts(unittest.TestCase):
for a in alerts: for a in alerts:
print(a.message()) print(a.message())
for field_name in dir(a): for field_name in dir(a):
if field_name.startswith('__'): continue if field_name.startswith('__'):
continue
field = getattr(a, field_name) field = getattr(a, field_name)
if callable(field): if callable(field):
print(' ', field_name, ' = ', field()) print(' ', field_name, ' = ', field())
@ -203,9 +218,10 @@ class test_alerts(unittest.TestCase):
self.assertEqual(st.save_path, os.getcwd()) self.assertEqual(st.save_path, os.getcwd())
def test_pop_alerts(self): def test_pop_alerts(self):
ses = lt.session({'alert_mask': lt.alert.category_t.all_categories, 'enable_dht': False}) ses = lt.session({'alert_mask': lt.alert.category_t.all_categories,
'enable_dht': False})
ses.async_add_torrent({"ti": lt.torrent_info("base.torrent"), "save_path": "."}) ses.async_add_torrent(
{"ti": lt.torrent_info("base.torrent"), "save_path": "."})
# this will cause an error (because of duplicate torrents) and the # this will cause an error (because of duplicate torrents) and the
# torrent_info object created here will be deleted once the alert goes out # torrent_info object created here will be deleted once the alert goes out
# of scope. When that happens, it will decrement the python object, to allow # of scope. When that happens, it will decrement the python object, to allow
@ -213,7 +229,8 @@ class test_alerts(unittest.TestCase):
# we're trying to catch the error described in this post, with regards to # we're trying to catch the error described in this post, with regards to
# torrent_info. # torrent_info.
# https://mail.python.org/pipermail/cplusplus-sig/2007-June/012130.html # https://mail.python.org/pipermail/cplusplus-sig/2007-June/012130.html
ses.async_add_torrent({"ti": lt.torrent_info("base.torrent"), "save_path": "."}) ses.async_add_torrent(
{"ti": lt.torrent_info("base.torrent"), "save_path": "."})
time.sleep(1) time.sleep(1)
for i in range(0, 10): for i in range(0, 10):
alerts = ses.pop_alerts() alerts = ses.pop_alerts()
@ -221,6 +238,7 @@ class test_alerts(unittest.TestCase):
print(a.message()) print(a.message())
time.sleep(0.1) time.sleep(0.1)
class test_bencoder(unittest.TestCase): class test_bencoder(unittest.TestCase):
def test_bencode(self): def test_bencode(self):
@ -234,6 +252,7 @@ class test_bencoder(unittest.TestCase):
decoded = lt.bdecode(encoded) decoded = lt.bdecode(encoded)
self.assertEqual(decoded, {b'a': 1, b'b': [1, 2, 3], b'c': b'foo'}) self.assertEqual(decoded, {b'a': 1, b'b': [1, 2, 3], b'c': b'foo'})
class test_sha1hash(unittest.TestCase): class test_sha1hash(unittest.TestCase):
def test_sha1hash(self): def test_sha1hash(self):
@ -245,7 +264,8 @@ class test_sha1hash(unittest.TestCase):
class test_session(unittest.TestCase): class test_session(unittest.TestCase):
def test_post_session_stats(self): def test_post_session_stats(self):
s = lt.session({'alert_mask': lt.alert.category_t.stats_notification, 'enable_dht': False}) s = lt.session({'alert_mask': lt.alert.category_t.stats_notification,
'enable_dht': False})
s.post_session_stats() s.post_session_stats()
a = s.wait_for_alert(1000) a = s.wait_for_alert(1000)
self.assertTrue(isinstance(a, lt.session_stats_alert)) self.assertTrue(isinstance(a, lt.session_stats_alert))
@ -253,8 +273,10 @@ class test_session(unittest.TestCase):
self.assertTrue(len(a.values) > 0) self.assertTrue(len(a.values) > 0)
def test_add_torrent(self): def test_add_torrent(self):
s = lt.session({'alert_mask': lt.alert.category_t.stats_notification, 'enable_dht': False}) s = lt.session({'alert_mask': lt.alert.category_t.stats_notification,
h = s.add_torrent({'ti': lt.torrent_info('base.torrent'), 'enable_dht': False})
s.add_torrent({
'ti': lt.torrent_info('base.torrent'),
'save_path': '.', 'save_path': '.',
'dht_nodes': [('1.2.3.4', 6881), ('4.3.2.1', 6881)], 'dht_nodes': [('1.2.3.4', 6881), ('4.3.2.1', 6881)],
'http_seeds': ['http://test.com/seed'], 'http_seeds': ['http://test.com/seed'],
@ -264,13 +286,12 @@ class test_session(unittest.TestCase):
def test_unknown_settings(self): def test_unknown_settings(self):
try: try:
s = lt.session({'unexpected-key-name': 42}) lt.session({'unexpected-key-name': 42})
self.assertFalse('should have thrown an exception') self.assertFalse('should have thrown an exception')
except KeyError as e: except KeyError as e:
print(e) print(e)
def test_apply_settings(self): def test_apply_settings(self):
s = lt.session({'enable_dht': False}) s = lt.session({'enable_dht': False})
s.apply_settings({'num_want': 66, 'user_agent': 'test123'}) s.apply_settings({'num_want': 66, 'user_agent': 'test123'})
self.assertEqual(s.get_settings()['num_want'], 66) self.assertEqual(s.get_settings()['num_want'], 66)
@ -279,8 +300,10 @@ class test_session(unittest.TestCase):
if __name__ == '__main__': if __name__ == '__main__':
print(lt.__version__) print(lt.__version__)
shutil.copy(os.path.join('..', '..', 'test', 'test_torrents', 'url_seed_multi.torrent'), '.') shutil.copy(os.path.join('..', '..', 'test', 'test_torrents',
shutil.copy(os.path.join('..', '..', 'test', 'test_torrents', 'base.torrent'), '.') 'url_seed_multi.torrent'), '.')
shutil.copy(os.path.join('..', '..', 'test', 'test_torrents', 'unordered.torrent'), '.') shutil.copy(os.path.join('..', '..', 'test', 'test_torrents',
'base.torrent'), '.')
shutil.copy(os.path.join('..', '..', 'test', 'test_torrents',
'unordered.torrent'), '.')
unittest.main() unittest.main()

1
setup.py
View File

@ -1,7 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import sys
os.chdir('bindings/python') os.chdir('bindings/python')
with open('setup.py') as filename: with open('setup.py') as filename: