jandieman/searxng
2
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2025-12-26 13:40:03 +00:00
Code Issues Projects Releases Wiki Activity

[mod] various engines: use eval_xpath* functions and searx.exceptions.*

Browse Source 
Engine list: ahmia, duckduckgo_images, elasticsearch, google, google_images, google_videos, youtube_api
This commit is contained in:
Alexandre Flament
2020-11-26 17:22:54 +01:00
parent ad72803ed9
commit 64cccae99e
7 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
searx/engines/duckduckgo_images.py
View File

@@ -15,6 +15,7 @@
from json import loads
from urllib.parse import urlencode
from searx.exceptions import SearxEngineAPIException
from searx.engines.duckduckgo import get_region_code
from searx.engines.duckduckgo import _fetch_supported_languages, supported_languages_url # NOQA # pylint: disable=unused-import
from searx.poolrequests import get
@@ -37,7 +38,7 @@ def get_vqd(query, headers):
res = get(query_url, headers=headers)
content = res.text
if content.find('vqd=\'') == -1:
raise Exception('Request failed')
raise SearxEngineAPIException('Request failed')
vqd = content[content.find('vqd=\'') + 5:]
vqd = vqd[:vqd.find('\'')]
return vqd
@@ -71,10 +72,7 @@ def response(resp):
results = []
content = resp.text
try:
res_json = loads(content)
except:
raise Exception('Cannot parse results')
res_json = loads(content)
# parse results
for result in res_json['results']: