d14e278 · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

[fix]torrentz search engine fixed for new version

d14e278misnyo9 years ago

searx/engines/torrentz.py+22−16

compare with master

unifiedsplit

@@ -1,7 +1,7 @@

1"""

2− Torrentz.eu (BitTorrent meta-search engine)

2+ Torrentz2.eu (BitTorrent meta-search engine)

4− @website https://torrentz.eu/

4+ @website https://torrentz2.eu/

5 @provide-api no

7 @using-api no

@@ -14,24 +14,24 @@

14import re

15from lxml import html

16from datetime import datetime

17−from searx.engines.nyaa import int_or_zero, get_filesize_mul

18from searx.engines.xpath import extract_text

17from searx.engines.xpath import extract_text

19from searx.url_utils import urlencode

18from searx.url_utils import urlencode

19+from searx.utils import get_torrent_size

21# engine dependent config

22categories = ['files', 'videos', 'music']

23paging = True

25# search-url

26−# https://torrentz.eu/search?f=EXAMPLE&p=6

26+# https://torrentz2.eu/search?f=EXAMPLE&p=6

27−base_url = 'https://torrentz.eu/'

27+base_url = 'https://torrentz2.eu/'

28search_url = base_url + 'search?{query}'

31# do search-request

32def request(query, params):

33 page = params['pageno'] - 1

34− query = urlencode({'q': query, 'p': page})

34+ query = urlencode({'f': query, 'p': page})

35 params['url'] = search_url.format(query=query)

36 return params

@@ -54,22 +54,29 @@ def response(resp):

54 # extract url and remove a slash in the beginning

55 link = links[0].attrib.get('href').lstrip('/')

57+ seed = 0

58+ leech = 0

59+ try:

57− seed = result.xpath('./dd/span[@class="u"]/text()')[0].replace(',', '')

60+ seed = int(result.xpath('./dd/span[4]/text()')[0].replace(',', ''))

58− leech = result.xpath('./dd/span[@class="d"]/text()')[0].replace(',', '')

61+ leech = int(result.xpath('./dd/span[5]/text()')[0].replace(',', ''))

62+ except:

63+ pass

60 params = {

65 params = {

61 'url': base_url + link,

66 'url': base_url + link,

62 'title': title,

67 'title': title,

63− 'seed': int_or_zero(seed),

68+ 'seed': seed,

64− 'leech': int_or_zero(leech),

69+ 'leech': leech,

65 'template': 'torrent.html'

70 'template': 'torrent.html'

66 }

71 }

68 # let's try to calculate the torrent size

73 # let's try to calculate the torrent size

69 try:

74 try:

70− size_str = result.xpath('./dd/span[@class="s"]/text()')[0]

75+ filesize_info = result.xpath('./dd/span[3]/text()')[0]

71− size, suffix = size_str.split()

76+ filesize, filesize_multiplier = filesize_info.split()

77+ filesize = get_torrent_size(filesize, filesize_multiplier)

78+

72− params['filesize'] = int(size) * get_filesize_mul(suffix)

79+ params['filesize'] = filesize

73 except:

80 except:

74 pass

81 pass

@@ -80,9 +87,8 @@ def response(resp):

81 # extract and convert creation date

88 # extract and convert creation date

82 try:

89 try:

83− date_str = result.xpath('./dd/span[@class="a"]/span')[0].attrib.get('title')

90+ date_ts = result.xpath('./dd/span[2]')[0].attrib.get('title')

84− # Fri, 25 Mar 2016 16:29:01

91+ date = datetime.fromtimestamp(float(date_ts))

85− date = datetime.strptime(date_str, '%a, %d %b %Y %H:%M:%S')

86 params['publishedDate'] = date

92 params['publishedDate'] = date

87 except:

93 except:

88 pass

94 pass

searx/settings.yml+6

@@ -552,6 +552,12 @@ engines:

552 timeout : 6.0

553 disabled : True

554

555+ - name : torrentz

556+ engine : torrentz

557+ shortcut : tor

558+ url: https://torrentz2.eu/

559+ timeout : 3.0

560+

555 - name : twitter

561 - name : twitter

556 engine : twitter

562 engine : twitter

557 shortcut : tw

563 shortcut : tw

tests/unit/engines/test_torrentz.py+14−18

@@ -14,7 +14,7 @@ class TestTorrentzEngine(SearxTestCase):

14 params = torrentz.request(query, dic)

15 self.assertTrue('url' in params)

16 self.assertTrue(query in params['url'])

17− self.assertTrue('torrentz.eu' in params['url'])

17+ self.assertTrue('torrentz2.eu' in params['url'])

19 def test_response(self):

20 resp = mock.Mock(text='<html></html>')

@@ -30,13 +30,11 @@ class TestTorrentzEngine(SearxTestCase):

30 books ebooks

31 </dt>

32 <dd>

33− 1

33+ 1

34−

34+ 5 hours

35− 4 months

36−

37− 30 MB

35+ 30 MB

38− 14

36+ 14

39− 1

37+ 1

40 </dd>

38 </dd>

41 </dl>

39 </dl>

@@ -48,13 +46,11 @@ class TestTorrentzEngine(SearxTestCase):

48 books ebooks

46 books ebooks

49 </dt>

47 </dt>

50 <dd>

48 <dd>

51− 1

49+ 1

52−

50+ 5 hours

53− 4 months

54−

55− 30MB

51+ 30MB

56− 5,555

52+ 5,555

57− 1,234,567

53+ 1,234,567

58 </dd>

54 </dd>

59 </dl>

55 </dl>

60 </div>

56 </div>

@@ -68,10 +64,10 @@ class TestTorrentzEngine(SearxTestCase):

69 # testing against the first result

65 # testing against the first result

70 r = results[0]

66 r = results[0]

71− self.assertEqual(r['url'], 'https://torrentz.eu/4362e08b1d80e1820fb2550b752f9f3126fe76d6')

67+ self.assertEqual(r['url'], 'https://torrentz2.eu/4362e08b1d80e1820fb2550b752f9f3126fe76d6')

72 self.assertEqual(r['title'], 'Completely valid info books ebooks')

68 self.assertEqual(r['title'], 'Completely valid info books ebooks')

73 # 22 Nov 2015 03:01:42

69 # 22 Nov 2015 03:01:42

74− self.assertEqual(r['publishedDate'], datetime(2015, 11, 22, 3, 1, 42))

70+ self.assertEqual(r['publishedDate'], datetime(2017, 8, 24, 19, 32, 4))

75 self.assertEqual(r['seed'], 14)

71 self.assertEqual(r['seed'], 14)

76 self.assertEqual(r['leech'], 1)

72 self.assertEqual(r['leech'], 1)

77 self.assertEqual(r['filesize'], 30 * 1024 * 1024)

73 self.assertEqual(r['filesize'], 30 * 1024 * 1024)

@@ -79,7 +75,7 @@ class TestTorrentzEngine(SearxTestCase):

80 # testing against the second result

76 # testing against the second result

81 r = results[1]

77 r = results[1]

82− self.assertEqual(r['url'], 'https://torrentz.eu/poaskdpokaspod')

78+ self.assertEqual(r['url'], 'https://torrentz2.eu/poaskdpokaspod')

83 self.assertEqual(r['title'], 'Invalid hash and date and filesize books ebooks')

79 self.assertEqual(r['title'], 'Invalid hash and date and filesize books ebooks')

84 self.assertEqual(r['seed'], 5555)

80 self.assertEqual(r['seed'], 5555)

85 self.assertEqual(r['leech'], 1234567)

81 self.assertEqual(r['leech'], 1234567)