[fix] solidtorrents engine: JSON API no longer exists

The API endpoint, we where using does not exist anymore.  This patch is a
rewrite that parses the HTML page.

Related: https://github.com/paulgoio/searxng/issues/17
Closes: https://github.com/searxng/searxng/issues/858

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-02-04 01:11:44 +01:00
parent 9fae80facb
commit d92b3d96fd
2 changed files with 64 additions and 25 deletions

View File

@ -1,51 +1,85 @@
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
# lint: pylint # lint: pylint
"""Solid Torrents """SolidTorrents
""" """
from json import loads from datetime import datetime
from urllib.parse import urlencode from urllib.parse import urlencode
import random
from lxml import html
from searx.utils import extract_text, eval_xpath, eval_xpath_getindex
about = { about = {
"website": 'https://www.solidtorrents.net/', "website": 'https://www.solidtorrents.net/',
"wikidata_id": None, "wikidata_id": None,
"official_api_documentation": None, "official_api_documentation": None,
"use_official_api": True, "use_official_api": False,
"require_api_key": False, "require_api_key": False,
"results": 'JSON', "results": 'HTML',
} }
categories = ['files'] categories = ['files']
paging = True paging = True
base_url = 'https://www.solidtorrents.net/' base_url = ''
search_url = base_url + 'api/v1/search?{query}' base_url_rand = ''
units = {"B": 1, "KB": 2 ** 10, "MB": 2 ** 20, "GB": 2 ** 30, "TB": 2 ** 40}
def size2int(size_str):
n, u = size_str.split()
return int(float(n.strip()) * units[u.strip()])
def request(query, params): def request(query, params):
skip = (params['pageno'] - 1) * 20 global base_url_rand # pylint: disable=global-statement
query = urlencode({'q': query, 'skip': skip}) if isinstance(base_url, list):
base_url_rand = random.choice(base_url)
else:
base_url_rand = base_url
search_url = base_url_rand + '/search?{query}'
page = (params['pageno'] - 1) * 20
query = urlencode({'q': query, 'page': page})
params['url'] = search_url.format(query=query) params['url'] = search_url.format(query=query)
logger.debug("query_url --> %s", params['url'])
return params return params
def response(resp): def response(resp):
results = [] results = []
search_results = loads(resp.text) dom = html.fromstring(resp.text)
for result in search_results["results"]: for result in eval_xpath(dom, '//div[contains(@class, "search-result")]'):
results.append( a = eval_xpath_getindex(result, './div/h5/a', 0, None)
{ if a is None:
'infohash': result["infohash"], continue
'seed': result["swarm"]["seeders"], title = extract_text(a)
'leech': result["swarm"]["leechers"], url = eval_xpath_getindex(a, '@href', 0, None)
'title': result["title"], stats = eval_xpath(result, './div//div[contains(@class, "stats")]/div')
'url': "https://solidtorrents.net/view/" + result["_id"], filesize = size2int(extract_text(stats[1]))
'filesize': result["size"], leech = extract_text(stats[2])
'magnetlink': result["magnet"], seed = extract_text(stats[3])
magnet = eval_xpath_getindex(result, './div//a[contains(@class, "dl-magnet")]/@href', 0, None)
params = {
'seed': seed,
'leech': leech,
'title': title,
'url': base_url_rand + url,
'filesize': filesize,
'magnetlink': magnet,
'template': "torrent.html", 'template': "torrent.html",
} }
)
date_str = extract_text(stats[4])
try:
params['publishedDate'] = datetime.strptime(date_str, '%b %d, %Y')
except ValueError:
pass
results.append(params)
return results return results

View File

@ -1257,8 +1257,13 @@ engines:
- name: solidtorrents - name: solidtorrents
engine: solidtorrents engine: solidtorrents
shortcut: solid shortcut: solid
timeout: 3.0 timeout: 4.0
disabled: false disabled: false
base_url:
- https://solidtorrents.net
- https://solidtorrents.eu
- https://solidtorrents.to
- https://bitsearch.to
# For this demo of the sqlite engine download: # For this demo of the sqlite engine download:
# https://liste.mediathekview.de/filmliste-v2.db.bz2 # https://liste.mediathekview.de/filmliste-v2.db.bz2