Merge pull request #233 from dalf/master

[fix] kickass engine
This commit is contained in:
Adam Tauber 2015-02-12 15:20:17 +01:00
commit ec2516b93d
2 changed files with 9 additions and 4 deletions

View file

@ -20,7 +20,7 @@ categories = ['videos', 'music', 'files']
paging = True paging = True
# search-url # search-url
url = 'https://kickass.so/' url = 'https://kickass.to/'
search_url = url + 'search/{search_term}/{pageno}/' search_url = url + 'search/{search_term}/{pageno}/'
# specific xpath variables # specific xpath variables
@ -45,6 +45,11 @@ def request(query, params):
def response(resp): def response(resp):
results = [] results = []
# check if redirect comparing to the True value,
# because resp can be a Mock object, and any attribut name returns something.
if resp.is_redirect is True:
return results
dom = html.fromstring(resp.text) dom = html.fromstring(resp.text)
search_res = dom.xpath('//table[@class="data"]//tr') search_res = dom.xpath('//table[@class="data"]//tr')

View file

@ -14,7 +14,7 @@ class TestKickassEngine(SearxTestCase):
params = kickass.request(query, dicto) params = kickass.request(query, dicto)
self.assertIn('url', params) self.assertIn('url', params)
self.assertIn(query, params['url']) self.assertIn(query, params['url'])
self.assertIn('kickass.so', params['url']) self.assertIn('kickass.to', params['url'])
self.assertIn('verify', params) self.assertIn('verify', params)
self.assertFalse(params['verify']) self.assertFalse(params['verify'])
@ -98,7 +98,7 @@ class TestKickassEngine(SearxTestCase):
self.assertEqual(type(results), list) self.assertEqual(type(results), list)
self.assertEqual(len(results), 1) self.assertEqual(len(results), 1)
self.assertEqual(results[0]['title'], 'This should be the title') self.assertEqual(results[0]['title'], 'This should be the title')
self.assertEqual(results[0]['url'], 'https://kickass.so/url.html') self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted') self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')
self.assertEqual(results[0]['seed'], 10) self.assertEqual(results[0]['seed'], 10)
self.assertEqual(results[0]['leech'], 1) self.assertEqual(results[0]['leech'], 1)
@ -381,7 +381,7 @@ class TestKickassEngine(SearxTestCase):
self.assertEqual(type(results), list) self.assertEqual(type(results), list)
self.assertEqual(len(results), 5) self.assertEqual(len(results), 5)
self.assertEqual(results[0]['title'], 'This should be the title') self.assertEqual(results[0]['title'], 'This should be the title')
self.assertEqual(results[0]['url'], 'https://kickass.so/url.html') self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted') self.assertEqual(results[0]['content'], 'Posted by riri in Other > Unsorted')
self.assertEqual(results[0]['seed'], 10) self.assertEqual(results[0]['seed'], 10)
self.assertEqual(results[0]['leech'], 1) self.assertEqual(results[0]['leech'], 1)