diff --git a/searx/engines/qwant.py b/searx/engines/qwant.py index a1799491a..e8b1d7739 100644 --- a/searx/engines/qwant.py +++ b/searx/engines/qwant.py @@ -9,16 +9,16 @@ https://www.qwant.com/ queries. This implementation is used by different qwant engines in the settings.yml:: - name: qwant - categories: general + qwant_categ: web ... - name: qwant news - categories: news + qwant_categ: news ... - name: qwant images - categories: images + qwant_categ: images ... - name: qwant videos - categories: videos + qwant_categ: videos ... """ @@ -50,13 +50,7 @@ about = { categories = [] paging = True supported_languages_url = about['website'] - -category_to_keyword = { - 'general': 'web', - 'news': 'news', - 'images': 'images', - 'videos': 'videos', -} +qwant_categ = None # web|news|inages|videos # search-url url = 'https://api.qwant.com/v3/search/{keyword}?{query}&count={count}&offset={offset}' @@ -64,10 +58,9 @@ url = 'https://api.qwant.com/v3/search/{keyword}?{query}&count={count}&offset={o def request(query, params): """Qwant search request""" - keyword = category_to_keyword[categories[0]] count = 10 # web: count must be equal to 10 - if keyword == 'images': + if qwant_categ == 'images': count = 50 offset = (params['pageno'] - 1) * count # count + offset must be lower than 250 @@ -78,7 +71,7 @@ def request(query, params): offset = min(offset, 40) params['url'] = url.format( - keyword=keyword, + keyword=qwant_categ, query=urlencode({'q': query}), offset=offset, count=count, @@ -103,7 +96,6 @@ def response(resp): """Get response from Qwant's search request""" # pylint: disable=too-many-locals, too-many-branches, too-many-statements - keyword = category_to_keyword[categories[0]] results = [] # load JSON result @@ -125,7 +117,7 @@ def response(resp): # raise for other errors raise_for_httperror(resp) - if keyword == 'web': + if qwant_categ == 'web': # The WEB query contains a list named 'mainline'. This list can contain # different result types (e.g. mainline[0]['type'] returns type of the # result items in mainline[0]['items'] @@ -136,7 +128,7 @@ def response(resp): # result['items']. mainline = data.get('result', {}).get('items', []) mainline = [ - {'type': keyword, 'items': mainline}, + {'type': qwant_categ, 'items': mainline}, ] # return empty array if there are no results @@ -146,7 +138,7 @@ def response(resp): for row in mainline: mainline_type = row.get('type', 'web') - if mainline_type != keyword: + if mainline_type != qwant_categ: continue if mainline_type == 'ads': diff --git a/searx/settings.yml b/searx/settings.yml index 6cae30c48..9530a4420 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1198,6 +1198,7 @@ engines: results: HTML - name: qwant + qwant_categ: web engine: qwant shortcut: qw categories: [general, web] @@ -1206,6 +1207,7 @@ engines: rosebud: *test_rosebud - name: qwant news + qwant_categ: news engine: qwant shortcut: qwn categories: news @@ -1213,6 +1215,7 @@ engines: network: qwant - name: qwant images + qwant_categ: images engine: qwant shortcut: qwi categories: [images, web] @@ -1220,6 +1223,7 @@ engines: network: qwant - name: qwant videos + qwant_categ: videos engine: qwant shortcut: qwv categories: [videos, web]