Browse Source

Merge pull request #233 from dalf/master

[fix] kickass engine
Adam Tauber 10 years ago
parent
commit
ec2516b93d
2 changed files with 9 additions and 4 deletions
  1. 6
    1
      searx/engines/kickass.py
  2. 3
    3
      searx/tests/engines/test_kickass.py

+ 6
- 1
searx/engines/kickass.py View File

20
 paging = True
20
 paging = True
21
 
21
 
22
 # search-url
22
 # search-url
23
-url = 'https://kickass.so/'
23
+url = 'https://kickass.to/'
24
 search_url = url + 'search/{search_term}/{pageno}/'
24
 search_url = url + 'search/{search_term}/{pageno}/'
25
 
25
 
26
 # specific xpath variables
26
 # specific xpath variables
45
 def response(resp):
45
 def response(resp):
46
     results = []
46
     results = []
47
 
47
 
48
+    # check if redirect comparing to the True value,
49
+    # because resp can be a Mock object, and any attribut name returns something.
50
+    if resp.is_redirect is True:
51
+        return results
52
+
48
     dom = html.fromstring(resp.text)
53
     dom = html.fromstring(resp.text)
49
 
54
 
50
     search_res = dom.xpath('//table[@class="data"]//tr')
55
     search_res = dom.xpath('//table[@class="data"]//tr')

+ 3
- 3
searx/tests/engines/test_kickass.py View File

14
         params = kickass.request(query, dicto)
14
         params = kickass.request(query, dicto)
15
         self.assertIn('url', params)
15
         self.assertIn('url', params)
16
         self.assertIn(query, params['url'])
16
         self.assertIn(query, params['url'])
17
-        self.assertIn('kickass.so', params['url'])
17
+        self.assertIn('kickass.to', params['url'])
18
         self.assertIn('verify', params)
18
         self.assertIn('verify', params)
19
         self.assertFalse(params['verify'])
19
         self.assertFalse(params['verify'])
20
 
20
 
98
         self.assertEqual(type(results), list)
98
         self.assertEqual(type(results), list)
99
         self.assertEqual(len(results), 1)
99
         self.assertEqual(len(results), 1)
100
         self.assertEqual(results[0]['title'], 'This should be the title')
100
         self.assertEqual(results[0]['title'], 'This should be the title')
101
-        self.assertEqual(results[0]['url'], 'https://kickass.so/url.html')
101
+        self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
102
         self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')
102
         self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')
103
         self.assertEqual(results[0]['seed'], 10)
103
         self.assertEqual(results[0]['seed'], 10)
104
         self.assertEqual(results[0]['leech'], 1)
104
         self.assertEqual(results[0]['leech'], 1)
381
         self.assertEqual(type(results), list)
381
         self.assertEqual(type(results), list)
382
         self.assertEqual(len(results), 5)
382
         self.assertEqual(len(results), 5)
383
         self.assertEqual(results[0]['title'], 'This should be the title')
383
         self.assertEqual(results[0]['title'], 'This should be the title')
384
-        self.assertEqual(results[0]['url'], 'https://kickass.so/url.html')
384
+        self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
385
         self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')
385
         self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')
386
         self.assertEqual(results[0]['seed'], 10)
386
         self.assertEqual(results[0]['seed'], 10)
387
         self.assertEqual(results[0]['leech'], 1)
387
         self.assertEqual(results[0]['leech'], 1)