瀏覽代碼

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

Alexandre Flament 10 年之前
父節點
當前提交
36a08f2a6a
共有 3 個檔案被更改,包括 5 行新增8 行删除
  1. 1
    5
      searx/engines/piratebay.py
  2. 1
    0
      searx/settings.yml
  3. 3
    3
      searx/tests/engines/test_piratebay.py

+ 1
- 5
searx/engines/piratebay.py 查看文件

20
 paging = True
20
 paging = True
21
 
21
 
22
 # search-url
22
 # search-url
23
-url = 'https://thepiratebay.se/'
23
+url = 'https://thepiratebay.am/'
24
 search_url = url + 'search/{search_term}/{pageno}/99/{search_type}'
24
 search_url = url + 'search/{search_term}/{pageno}/99/{search_type}'
25
 
25
 
26
 # piratebay specific type-definitions
26
 # piratebay specific type-definitions
42
                                       search_type=search_type,
42
                                       search_type=search_type,
43
                                       pageno=params['pageno'] - 1)
43
                                       pageno=params['pageno'] - 1)
44
 
44
 
45
-    # FIX: SSLError: hostname 'kthepiratebay.se'
46
-    # doesn't match either of 'ssl2000.cloudflare.com', 'cloudflare.com', '*.cloudflare.com'
47
-    params['verify'] = False
48
-
49
     return params
45
     return params
50
 
46
 
51
 
47
 

+ 1
- 0
searx/settings.yml 查看文件

167
   - name : piratebay
167
   - name : piratebay
168
     engine : piratebay
168
     engine : piratebay
169
     shortcut : tpb
169
     shortcut : tpb
170
+    disabled : True
170
 
171
 
171
   - name : kickass
172
   - name : kickass
172
     engine : kickass
173
     engine : kickass

+ 3
- 3
searx/tests/engines/test_piratebay.py 查看文件

15
         params = piratebay.request(query, dicto)
15
         params = piratebay.request(query, dicto)
16
         self.assertIn('url', params)
16
         self.assertIn('url', params)
17
         self.assertIn(query, params['url'])
17
         self.assertIn(query, params['url'])
18
-        self.assertIn('piratebay.se', params['url'])
18
+        self.assertIn('piratebay.am', params['url'])
19
         self.assertIn('0', params['url'])
19
         self.assertIn('0', params['url'])
20
 
20
 
21
         dicto['category'] = 'music'
21
         dicto['category'] = 'music'
99
         self.assertEqual(type(results), list)
99
         self.assertEqual(type(results), list)
100
         self.assertEqual(len(results), 2)
100
         self.assertEqual(len(results), 2)
101
         self.assertEqual(results[0]['title'], 'This is the title')
101
         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')
103
         self.assertEqual(results[0]['content'], 'This is the content and should be OK')
103
         self.assertEqual(results[0]['content'], 'This is the content and should be OK')
104
         self.assertEqual(results[0]['seed'], 13)
104
         self.assertEqual(results[0]['seed'], 13)
105
         self.assertEqual(results[0]['leech'], 334)
105
         self.assertEqual(results[0]['leech'], 334)
149
         self.assertEqual(type(results), list)
149
         self.assertEqual(type(results), list)
150
         self.assertEqual(len(results), 1)
150
         self.assertEqual(len(results), 1)
151
         self.assertEqual(results[0]['title'], 'This is the title')
151
         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')
153
         self.assertEqual(results[0]['content'], 'This is the content and should be OK')
153
         self.assertEqual(results[0]['content'], 'This is the content and should be OK')
154
         self.assertEqual(results[0]['seed'], 0)
154
         self.assertEqual(results[0]['seed'], 0)
155
         self.assertEqual(results[0]['leech'], 0)
155
         self.assertEqual(results[0]['leech'], 0)