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

fix mirror sorting, test mirror choice

Browse Source
This commit is contained in:
Viktor Stanchev 2015-09-19 22:27:05 -07:00
parent 7ee1bbbccf
commit 9b8caf9e17
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pirate/pirate.py
View File

@ -7,6 +7,7 @@ import socket
import urllib.request as request import urllib.request as request
import urllib.error import urllib.error
import sys import sys
from collections import OrderedDict
import webbrowser import webbrowser
@ -226,8 +227,9 @@ def combine_configs(config, args):
return args return args
def search_mirrors(args): def search_mirrors(pages, category, sort, action, search):
mirrors = {'https://thepiratebay.mn'} mirrors = OrderedDict()
mirrors['https://thepiratebay.mn'] = None
try: try:
req = request.Request('https://proxybay.co/list.txt', req = request.Request('https://proxybay.co/list.txt',
headers=pirate.data.default_headers) headers=pirate.data.default_headers)
@ -237,19 +239,21 @@ def search_mirrors(args):
else: else:
if f.getcode() != 200: if f.getcode() != 200:
raise IOError('The proxy bay responded with an error.') raise IOError('The proxy bay responded with an error.')
mirrors = mirrors.union([i.decode('utf-8').strip() for mirror in [i.decode('utf-8').strip() for i in f.readlines()][3:]:
for i in f.readlines()][3:] mirrors[mirror] = None
).difference(pirate.data.blacklist) for mirror in pirate.data.blacklist:
if mirror in mirrors:
del mirrors[mirror]
for mirror in mirrors: for mirror in mirrors.keys():
try: try:
print('Trying', mirror, end='... \n') print('Trying', mirror, end='... \n')
results = pirate.torrent.remote( results = pirate.torrent.remote(
pages=args.pages, pages=pages,
category=pirate.torrent.parse_category(args.category), category=pirate.torrent.parse_category(category),
sort=pirate.torrent.parse_sort(args.sort), sort=pirate.torrent.parse_sort(sort),
mode=args.action, mode=action,
terms=args.search, terms=search,
mirror=mirror mirror=mirror
) )
except (urllib.error.URLError, socket.timeout, except (urllib.error.URLError, socket.timeout,
@ -296,7 +300,7 @@ def main():
if args.source == 'local_tpb': if args.source == 'local_tpb':
results = pirate.local.search(args.database, args.search) results = pirate.local.search(args.database, args.search)
elif args.source == 'tpb': elif args.source == 'tpb':
results, site = search_mirrors(args) results, site = search_mirrors(args.pages, args.category, args.sort, args.action, args.search)
if len(results) == 0: if len(results) == 0:
print('No results') print('No results')

22
tests/test_pirate.py
View File

@ -1,5 +1,9 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import socket
import unittest import unittest
from unittest import mock
from unittest.mock import patch, call
import pirate.pirate import pirate.pirate
@ -108,5 +112,23 @@ class TestPirate(unittest.TestCase):
value = getattr(args, option) value = getattr(args, option)
self.assertEqual(test[2][option], value) self.assertEqual(test[2][option], value)
def test_search_mirrors(self):
pages, category, sort, action, search = (1, 100, 10, 'browse', [])
class MockResponse():
readlines = mock.MagicMock(return_value=[x.encode('utf-8') for x in ['', '', '', 'https://example.com']])
info = mock.MagicMock()
getcode = mock.MagicMock(return_value=200)
response_obj = MockResponse()
with patch('urllib.request.urlopen', return_value=response_obj) as urlopen:
with patch('pirate.torrent.remote', return_value=[]) as remote:
results, mirror = pirate.pirate.search_mirrors(pages, category, sort, action, search)
remote.assert_called_once_with(pages=1, category=100, sort=10, mode='browse', terms=[], mirror='https://thepiratebay.mn')
with patch('pirate.torrent.remote', side_effect=[socket.timeout, []]) as remote:
results, mirror = pirate.pirate.search_mirrors(pages, category, sort, action, search)
remote.assert_has_calls([
call(pages=1, category=100, sort=10, mode='browse', terms=[], mirror='https://thepiratebay.mn'),
call(pages=1, category=100, sort=10, mode='browse', terms=[], mirror='https://example.com')
])
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()