OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

Merge pull request #223 from return42/fix-qwant

Browse source 
[fix] qwant engine - hardening the engine
This commit is contained in:
Alexandre Flament 2021-07-25 10:30:41 +02:00 committed by GitHub
commit cb4220657c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
searx/engines/qwant.py
View file

@ -84,14 +84,16 @@ def request(query, params):
) )
# add language tag # add language tag
if params['language'] != 'all': if params['language'] == 'all':
params['url'] += '&locale=en_us'
else:
language = match_language( language = match_language(
params['language'], params['language'],
# pylint: disable=undefined-variable # pylint: disable=undefined-variable
supported_languages, supported_languages,
language_aliases, language_aliases,
) )
params['url'] += '&locale=' + language.replace('-', '_') params['url'] += '&locale=' + language.replace('-', '_').lower()
params['raise_for_httperror'] = False params['raise_for_httperror'] = False
return params return params
@ -144,8 +146,8 @@ def response(resp):
mainline_items = row.get('items', []) mainline_items = row.get('items', [])
for item in mainline_items: for item in mainline_items:
title = item['title'] title = item.get('title', None)
res_url = item['url'] res_url = item.get('url', None)
if mainline_type == 'web': if mainline_type == 'web':
content = item['desc'] content = item['desc']
@ -156,7 +158,10 @@ def response(resp):
}) })
elif mainline_type == 'news': elif mainline_type == 'news':
pub_date = datetime.fromtimestamp(item['date'], None)
pub_date = item['date']
if pub_date is not None:
pub_date = datetime.fromtimestamp(pub_date)
news_media = item.get('media', []) news_media = item.get('media', [])
img_src = None img_src = None
if news_media: if news_media:
@ -192,8 +197,12 @@ def response(resp):
if c: if c:
content_parts.append("%s: %s " % (gettext("Channel"), c)) content_parts.append("%s: %s " % (gettext("Channel"), c))
content = ' // '.join(content_parts) content = ' // '.join(content_parts)
length = timedelta(seconds=item['duration']) length = item['duration']
pub_date = datetime.fromtimestamp(item['date']) if length is not None:
length = timedelta(milliseconds=length)
pub_date = item['date']
if pub_date is not None:
pub_date = datetime.fromtimestamp(pub_date)
thumbnail = item['thumbnail'] thumbnail = item['thumbnail']
# from some locations (DE and others?) the s2 link do # from some locations (DE and others?) the s2 link do
# response a 'Please wait ..' but does not deliver the thumbnail # response a 'Please wait ..' but does not deliver the thumbnail