rnhmjoj/pirate-get
1
0
Fork 0
mirror of https://github.com/vikstrous/pirate-get synced 2025-01-09 09:59:51 +01:00
Code Issues Releases Wiki Activity

fix mode handling and test

Browse Source
This commit is contained in:
Michele Guerini Rocco 2020-05-21 16:32:01 +02:00
parent c54c19ac01
commit 8eefc63226
Signed by: rnhmjoj
GPG Key ID: BFBAF4C975F76450
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pirate/torrent.py
View File

@ -84,15 +84,24 @@ def parse_page(page):
return results
def remote(printer, category, sort, mode, terms, mirror, timeout):
# special query when no terms
if not terms:
if category == 0:
category = 'all'
query = '/precompiled/data_top100_{}.json'.format(category)
else:
def build_request_path(mode, category, terms):
if mode == 'search':
query = '/q.php?q={}&cat={}'.format(' '.join(terms), category)
elif mode == 'top':
cat = 'all' if category == 0 else category
query = '/precompiled/data_top100_{}.json'.format(cat)
elif mode == 'recent':
query = '/precompiled/data_top100_recent.json'
elif mode == 'browse':
raise NotImplementedError
else:
raise Exception('Invalid mode', mode)
return parse.quote(query, '?=&/')
def remote(printer, category, sort, mode, terms, mirror, timeout):
query = build_request_path(mode, category, terms)
# Catch the Ctrl-C exception and exit cleanly
try:
req = request.Request(

41
tests/test_torrent.py
View File

@ -63,26 +63,27 @@ class TestTorrent(unittest.TestCase):
self.assertEqual(99, sort)
def test_request_path(self):
# the args are (page, category, sort, mode, terms)
tests = [
((0, 100, 10, 'browse', []), '/browse/100/0/10'),
((0, 0, 10, 'browse', []), '/browse/100/0/10'),
((0, 0, 10, 'recent', []), '/top/48hall'),
((0, 100, 10, 'recent', []), '/top/48h100'),
((0, 100, 10, 'top', []), '/top/100'),
((0, 0, 10, 'top', []), '/top/all'),
((0, 100, 10, 'search', ['abc']), '/search/abc/0/10/100'),
((0, 100, 10, 'search', ['abc', 'def']), '/search/abc+def/0/10/100'),
((0, 100, 10, 'search', [u'\u1234']), '/search/%E1%88%B4/0/10/100'),
((0, 100, 10, 'asdf', []), Exception),
# the args are (mode, category, terms)
succeed = [
(('recent', 0, []), '/precompiled/data_top100_recent.json'),
(('recent', 100, []), '/precompiled/data_top100_recent.json'),
(('top', 0, []), '/precompiled/data_top100_all.json'),
(('top', 100, []), '/precompiled/data_top100_100.json'),
(('search', 100, ['abc']), '/q.php?q=abc&cat=100'),
(('search', 100, ['abc', 'def']), '/q.php?q=abc%20def&cat=100'),
(('search', 100, ['\u1234']), '/q.php?q=%E1%88%B4&cat=100'),
]
for test in tests:
if test[1] != Exception:
path = pirate.torrent.build_request_path(*test[0])
self.assertEqual(test[1], path)
else:
with self.assertRaises(test[1]):
pirate.torrent.build_request_path(test[0])
fail = [
(('browse', 100, []), NotImplementedError),
(('browse', 0, []), NotImplementedError),
(('asdf', 100, []), Exception),
]
for inp, out in succeed:
path = pirate.torrent.build_request_path(*inp)
self.assertEqual(out, path)
for inp, out, in fail:
with self.assertRaises(out):
pirate.torrent.build_request_path(*inp)
@patch('pirate.torrent.get_torrent')
def test_save_torrents(self, get_torrent):
@ -146,7 +147,7 @@ class TestTorrent(unittest.TestCase):
with patch('urllib.request.Request', return_value=req_obj) as req:
with patch('urllib.request.urlopen', return_value=res_obj) as res:
results = pirate.torrent.remote(
MagicMock(Printer), 100, 10, 'browse',
MagicMock(Printer), 100, 10, 'top',
[], 'http://example.com', 9)
req.assert_called_once_with(
'http://example.com/precompiled/data_top100_100.json',