36a08f2 · searx · git.iko.soy

git.iko.soy/searx

[fix] piratebay engine (and disable it by default)

commit36a08f2a6a9110ec842741f1cbd5e8d67b3dd524 authorAlexandre Flament <alex@al-f.net> dateWed 27 May 2015, 12:28 (11 years ago) parent37eb0fb

3 files changed+5−8

compare with master

unifiedsplit

searx/engines/piratebay.py+1−5 searx/settings.yml+1 searx/tests/engines/test_piratebay.py+3−3

searx/engines/piratebay.py+1−5

@@ -20,7 +20,7 @@ categories = ['videos', 'music', 'files']

2020paging = True

2121

2222# search-url

23−url = 'https://thepiratebay.se/'

23+url = 'https://thepiratebay.am/'

2424search_url = url + 'search/{search_term}/{pageno}/99/{search_type}'

2525

2626# piratebay specific type-definitions

@@ -42,10 +42,6 @@ def request(query, params):

4242 search_type=search_type,

4343 pageno=params['pageno'] - 1)

4444

45− # FIX: SSLError: hostname 'kthepiratebay.se'

46− # doesn't match either of 'ssl2000.cloudflare.com', 'cloudflare.com', '*.cloudflare.com'

47− params['verify'] = False

48−

4945 return params

5046

5147

searx/settings.yml+1

@@ -167,6 +167,7 @@ engines:

167167 - name : piratebay

168168 engine : piratebay

169169 shortcut : tpb

170+ disabled : True

170171

171172 - name : kickass

172173 engine : kickass

searx/tests/engines/test_piratebay.py+3−3

@@ -15,7 +15,7 @@ class TestPiratebayEngine(SearxTestCase):

1515 params = piratebay.request(query, dicto)

1616 self.assertIn('url', params)

1717 self.assertIn(query, params['url'])

18− self.assertIn('piratebay.se', params['url'])

18+ self.assertIn('piratebay.am', params['url'])

1919 self.assertIn('0', params['url'])

2020

2121 dicto['category'] = 'music'

@@ -99,7 +99,7 @@ class TestPiratebayEngine(SearxTestCase):

9999 self.assertEqual(type(results), list)

100100 self.assertEqual(len(results), 2)

101101 self.assertEqual(results[0]['title'], 'This is the title')

102− self.assertEqual(results[0]['url'], 'https://thepiratebay.se/this.is.the.link')

102+ self.assertEqual(results[0]['url'], 'https://thepiratebay.am/this.is.the.link')

103103 self.assertEqual(results[0]['content'], 'This is the content and should be OK')

104104 self.assertEqual(results[0]['seed'], 13)

105105 self.assertEqual(results[0]['leech'], 334)

@@ -149,7 +149,7 @@ class TestPiratebayEngine(SearxTestCase):

149149 self.assertEqual(type(results), list)

150150 self.assertEqual(len(results), 1)

151151 self.assertEqual(results[0]['title'], 'This is the title')

152− self.assertEqual(results[0]['url'], 'https://thepiratebay.se/this.is.the.link')

152+ self.assertEqual(results[0]['url'], 'https://thepiratebay.am/this.is.the.link')

153153 self.assertEqual(results[0]['content'], 'This is the content and should be OK')

154154 self.assertEqual(results[0]['seed'], 0)

155155 self.assertEqual(results[0]['leech'], 0)