[mod] tokyotoshokan dependecy to other engine removed

This commit is contained in:
misnyo 2017-08-31 21:31:40 +02:00
parent e74aaa781e
commit 1e2b60f380

View file

@ -14,8 +14,8 @@ import re
from lxml import html
from searx.engines.xpath import extract_text
from datetime import datetime
from searx.engines.nyaa import int_or_zero, get_filesize_mul
from searx.url_utils import urlencode
from searx.utils import get_torrent_size
# engine dependent config
categories = ['files', 'videos', 'music']
@ -26,6 +26,17 @@ base_url = 'https://www.tokyotosho.info/'
search_url = base_url + 'search.php?{query}'
# convert a variable to integer or return 0 if it's not a number
def int_or_zero(num):
if isinstance(num, list):
if len(num) < 1:
return 0
num = num[0]
if num.isdigit():
return int(num)
return 0
# do search-request
def request(query, params):
query = urlencode({'page': params['pageno'], 'terms': query})
@ -76,8 +87,7 @@ def response(resp):
try:
# ('1.228', 'GB')
groups = size_re.match(item).groups()
multiplier = get_filesize_mul(groups[1])
params['filesize'] = int(multiplier * float(groups[0]))
params['filesize'] = get_torrent_size(groups[0], groups[1])
except:
pass
elif item.startswith('Date:'):