@@ -14,8 +14,8 @@ import re
1414from lxml import html
1515from searx.engines.xpath import extract_text
1616from datetime import datetime
17−from searx.engines.nyaa import int_or_zero, get_filesize_mul
1817from searx.url_utils import urlencode
18+from searx.utils import get_torrent_size
1919
2020# engine dependent config
2121categories = ['files', 'videos', 'music']
@@ -26,6 +26,17 @@ base_url = 'https://www.tokyotosho.info/'
2626search_url = base_url + 'search.php?{query}'
2727
2828
29+# convert a variable to integer or return 0 if it's not a number
30+def int_or_zero(num):
31+ if isinstance(num, list):
32+ if len(num) < 1:
33+ return 0
34+ num = num[0]
35+ if num.isdigit():
36+ return int(num)
37+ return 0
38+
39+
2940# do search-request
3041def request(query, params):
3142 query = urlencode({'page': params['pageno'], 'terms': query})
@@ -76,8 +87,7 @@ def response(resp):
7687 try:
7788 # ('1.228', 'GB')
7889 groups = size_re.match(item).groups()
79− multiplier = get_filesize_mul(groups[1])
80− params['filesize'] = int(multiplier * float(groups[0]))
90+ params['filesize'] = get_torrent_size(groups[0], groups[1])
8191 except:
8292 pass
8393 elif item.startswith('Date:'):