git.iko.soy/searx
on master help sign in
Merge pull request #728 from kvch/fix-kickass-torrents

fix kickass torrents engine

commit85c7237a4f26cea523d5c3b8a863058e459ca07a authorAdam Tauber <asciimoo@gmail.com> dateSat 22 Oct 2016, 05:40 (10 years ago) parent218857953c9fde
4 files changed+45−48
compare with master
unifiedsplit
searx/engines/kickass.py+11−35 searx/settings.yml+6 searx/utils.py+15 tests/unit/engines/test_kickass.py+13−13
searx/engines/kickass.py+11−35
@@ -16,13 +16,14 @@ from urllib import quote
1616from lxml import html
1717from operator import itemgetter
1818from searx.engines.xpath import extract_text
19+from searx.utils import get_torrent_size, convert_str_to_int
1920
2021# engine dependent config
2122categories = ['videos', 'music', 'files']
2223paging = True
2324
2425# search-url
25−url = 'https://kickass.to/'
26+url = 'https://kickass.cd/'
2627search_url = url + 'search/{search_term}/{pageno}/'
2728
2829# specific xpath variables
@@ -57,41 +58,16 @@ def response(resp):
5758 href = urljoin(url, link.attrib['href'])
5859 title = extract_text(link)
5960 content = escape(extract_text(result.xpath(content_xpath)))
60− seed = result.xpath('.//td[contains(@class, "green")]/text()')[0]
61− leech = result.xpath('.//td[contains(@class, "red")]/text()')[0]
62− filesize = result.xpath('.//td[contains(@class, "nobr")]/text()')[0]
63− filesize_multiplier = result.xpath('.//td[contains(@class, "nobr")]//span/text()')[0]
64− files = result.xpath('.//td[contains(@class, "center")][2]/text()')[0]
65−
66− # convert seed to int if possible
67− if seed.isdigit():
68− seed = int(seed)
69− else:
70− seed = 0
61+ seed = extract_text(result.xpath('.//td[contains(@class, "green")]'))
62+ leech = extract_text(result.xpath('.//td[contains(@class, "red")]'))
63+ filesize_info = extract_text(result.xpath('.//td[contains(@class, "nobr")]'))
64+ files = extract_text(result.xpath('.//td[contains(@class, "center")][2]'))
7165
72− # convert leech to int if possible
73− if leech.isdigit():
74− leech = int(leech)
75− else:
76− leech = 0
77−
78− # convert filesize to byte if possible
79− try:
80− filesize = float(filesize)
81−
82− # convert filesize to byte
83− if filesize_multiplier == 'TB':
84− filesize = int(filesize * 1024 * 1024 * 1024 * 1024)
85− elif filesize_multiplier == 'GB':
86− filesize = int(filesize * 1024 * 1024 * 1024)
87− elif filesize_multiplier == 'MB':
88− filesize = int(filesize * 1024 * 1024)
89− elif filesize_multiplier == 'KB':
90− filesize = int(filesize * 1024)
91− except:
92− filesize = None
93−
94− # convert files to int if possible
66+ seed = convert_str_to_int(seed)
67+ leech = convert_str_to_int(leech)
68+
69+ filesize, filesize_multiplier = filesize_info.split()
70+ filesize = get_torrent_size(filesize, filesize_multiplier)
9571 if files.isdigit():
9672 files = int(files)
9773 else:
searx/settings.yml+6
@@ -307,6 +307,12 @@ engines:
307307 timeout : 6.0
308308 disabled : True
309309
310+ - name: kickass
311+ engine : kickass
312+ shortcut : kc
313+ timeout : 4.0
314+ disabled : True
315+
310316 - name : microsoft academic
311317 engine : json_engine
312318 paging : True
searx/utils.py+15
@@ -252,12 +252,27 @@ def get_torrent_size(filesize, filesize_multiplier):
252252 filesize = int(filesize * 1024 * 1024)
253253 elif filesize_multiplier == 'KB':
254254 filesize = int(filesize * 1024)
255+ elif filesize_multiplier == 'TiB':
256+ filesize = int(filesize * 1000 * 1000 * 1000 * 1000)
257+ elif filesize_multiplier == 'GiB':
258+ filesize = int(filesize * 1000 * 1000 * 1000)
259+ elif filesize_multiplier == 'MiB':
260+ filesize = int(filesize * 1000 * 1000)
261+ elif filesize_multiplier == 'KiB':
262+ filesize = int(filesize * 1000)
255263 except:
256264 filesize = None
257265
258266 return filesize
259267
260268
269+def convert_str_to_int(number_str):
270+ if number_str.isdigit():
271+ return int(number_str)
272+ else:
273+ return 0
274+
275+
261276def is_valid_lang(lang):
262277 is_abbr = (len(lang) == 2)
263278 if is_abbr:
tests/unit/engines/test_kickass.py+13−13
@@ -14,7 +14,7 @@ class TestKickassEngine(SearxTestCase):
1414 params = kickass.request(query, dicto)
1515 self.assertIn('url', params)
1616 self.assertIn(query, params['url'])
17− self.assertIn('kickass.to', params['url'])
17+ self.assertIn('kickass.cd', params['url'])
1818 self.assertFalse(params['verify'])
1919
2020 def test_response(self):
@@ -84,7 +84,7 @@ class TestKickassEngine(SearxTestCase):
8484 </span>
8585 </div>
8686 </td>
87− <td class="nobr center">449 <span>bytes</span></td>
87+ <td class="nobr center">449 bytes</td>
8888 <td class="center">4</td>
8989 <td class="center">2&nbsp;years</td>
9090 <td class="green center">10</td>
@@ -97,7 +97,7 @@ class TestKickassEngine(SearxTestCase):
9797 self.assertEqual(type(results), list)
9898 self.assertEqual(len(results), 1)
9999 self.assertEqual(results[0]['title'], 'This should be the title')
100− self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
100+ self.assertEqual(results[0]['url'], 'https://kickass.cd/url.html')
101101 self.assertEqual(results[0]['content'], 'Posted by riri in Other &gt; Unsorted')
102102 self.assertEqual(results[0]['seed'], 10)
103103 self.assertEqual(results[0]['leech'], 1)
@@ -191,7 +191,7 @@ class TestKickassEngine(SearxTestCase):
191191 </span>
192192 </div>
193193 </td>
194− <td class="nobr center">1 <span>KB</span></td>
194+ <td class="nobr center">1 KiB</td>
195195 <td class="center">4</td>
196196 <td class="center">2&nbsp;years</td>
197197 <td class="green center">10</td>
@@ -235,7 +235,7 @@ class TestKickassEngine(SearxTestCase):
235235 </span>
236236 </div>
237237 </td>
238− <td class="nobr center">1 <span>MB</span></td>
238+ <td class="nobr center">1 MiB</td>
239239 <td class="center">4</td>
240240 <td class="center">2&nbsp;years</td>
241241 <td class="green center">9</td>
@@ -279,7 +279,7 @@ class TestKickassEngine(SearxTestCase):
279279 </span>
280280 </div>
281281 </td>
282− <td class="nobr center">1 <span>GB</span></td>
282+ <td class="nobr center">1 GiB</td>
283283 <td class="center">4</td>
284284 <td class="center">2&nbsp;years</td>
285285 <td class="green center">8</td>
@@ -323,7 +323,7 @@ class TestKickassEngine(SearxTestCase):
323323 </span>
324324 </div>
325325 </td>
326− <td class="nobr center">1 <span>TB</span></td>
326+ <td class="nobr center">1 TiB</td>
327327 <td class="center">4</td>
328328 <td class="center">2&nbsp;years</td>
329329 <td class="green center">7</td>
@@ -367,7 +367,7 @@ class TestKickassEngine(SearxTestCase):
367367 </span>
368368 </div>
369369 </td>
370− <td class="nobr center">z <span>bytes</span></td>
370+ <td class="nobr center">z bytes</td>
371371 <td class="center">r</td>
372372 <td class="center">2&nbsp;years</td>
373373 <td class="green center">a</td>
@@ -380,17 +380,17 @@ class TestKickassEngine(SearxTestCase):
380380 self.assertEqual(type(results), list)
381381 self.assertEqual(len(results), 5)
382382 self.assertEqual(results[0]['title'], 'This should be the title')
383− self.assertEqual(results[0]['url'], 'https://kickass.to/url.html')
383+ self.assertEqual(results[0]['url'], 'https://kickass.cd/url.html')
384384 self.assertEqual(results[0]['content'], 'Posted by riri in Other &gt; Unsorted')
385385 self.assertEqual(results[0]['seed'], 10)
386386 self.assertEqual(results[0]['leech'], 1)
387387 self.assertEqual(results[0]['files'], 4)
388388 self.assertEqual(results[0]['magnetlink'], 'magnet:?xt=urn:btih:MAGNETURL&dn=test')
389389 self.assertEqual(results[0]['torrentfile'], 'http://torcache.net/torrent/53917.torrent?title=test')
390− self.assertEqual(results[0]['filesize'], 1024)
391− self.assertEqual(results[1]['filesize'], 1048576)
392− self.assertEqual(results[2]['filesize'], 1073741824)
393− self.assertEqual(results[3]['filesize'], 1099511627776)
390+ self.assertEqual(results[0]['filesize'], 1000)
391+ self.assertEqual(results[1]['filesize'], 1000000)
392+ self.assertEqual(results[2]['filesize'], 1000000000)
393+ self.assertEqual(results[3]['filesize'], 1000000000000)
394394 self.assertEqual(results[4]['seed'], 0)
395395 self.assertEqual(results[4]['leech'], 0)
396396 self.assertEqual(results[4]['files'], None)