From 4be6deb0a1bc4f5750f331774161be9ce7b61442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9on=20Tiek=C3=B6tter?= Date: Fri, 7 Jan 2022 13:01:37 +0100 Subject: [fix] ccengine engine Change domain to api.openverse.engineering --- searx/engines/ccengine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'searx/engines') diff --git a/searx/engines/ccengine.py b/searx/engines/ccengine.py index 93ac30c86..6462e72ab 100644 --- a/searx/engines/ccengine.py +++ b/searx/engines/ccengine.py @@ -10,9 +10,9 @@ from urllib.parse import urlencode about = { - "website": 'https://search.creativecommons.org/', + "website": 'https://wordpress.org/openverse/', "wikidata_id": None, - "official_api_documentation": 'https://api.creativecommons.engineering/v1/', + "official_api_documentation": 'https://api.openverse.engineering/v1/', "use_official_api": True, "require_api_key": False, "results": 'JSON', @@ -23,7 +23,7 @@ categories = ['images'] paging = True nb_per_page = 20 -base_url = 'https://api.creativecommons.engineering/v1/images?' +base_url = 'https://api.openverse.engineering/v1/images?' search_string = '&page={page}&page_size={nb_per_page}&format=json&{query}' -- cgit v1.2.3 From 37baf46ecee32a5c541ec267e7d534f41c96d97c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9on=20Tiek=C3=B6tter?= Date: Fri, 7 Jan 2022 13:06:05 +0100 Subject: [fix] Rename ccengine engine to openverse The CC engine was merged with WordPress and renamed to Openverse Source: https://wordpress.org/news/2021/05/welcome-to-openverse/ --- searx/engines/ccengine.py | 54 ---------------------------------------------- searx/engines/openverse.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 searx/engines/ccengine.py create mode 100644 searx/engines/openverse.py (limited to 'searx/engines') diff --git a/searx/engines/ccengine.py b/searx/engines/ccengine.py deleted file mode 100644 index 6462e72ab..000000000 --- a/searx/engines/ccengine.py +++ /dev/null @@ -1,54 +0,0 @@ -# SPDX-License-Identifier: AGPL-3.0-or-later -""" - - Creative Commons search engine (Images) - -""" - -from json import loads -from urllib.parse import urlencode - - -about = { - "website": 'https://wordpress.org/openverse/', - "wikidata_id": None, - "official_api_documentation": 'https://api.openverse.engineering/v1/', - "use_official_api": True, - "require_api_key": False, - "results": 'JSON', -} - -categories = ['images'] - -paging = True -nb_per_page = 20 - -base_url = 'https://api.openverse.engineering/v1/images?' -search_string = '&page={page}&page_size={nb_per_page}&format=json&{query}' - - -def request(query, params): - - search_path = search_string.format(query=urlencode({'q': query}), nb_per_page=nb_per_page, page=params['pageno']) - - params['url'] = base_url + search_path - - return params - - -def response(resp): - results = [] - - json_data = loads(resp.text) - - for result in json_data['results']: - results.append( - { - 'url': result['foreign_landing_url'], - 'title': result['title'], - 'img_src': result['url'], - 'template': 'images.html', - } - ) - - return results diff --git a/searx/engines/openverse.py b/searx/engines/openverse.py new file mode 100644 index 000000000..0b12ecd5e --- /dev/null +++ b/searx/engines/openverse.py @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +""" + + Openverse (formerly known as: Creative Commons search engine) [Images] + +""" + +from json import loads +from urllib.parse import urlencode + + +about = { + "website": 'https://wordpress.org/openverse/', + "wikidata_id": None, + "official_api_documentation": 'https://api.openverse.engineering/v1/', + "use_official_api": True, + "require_api_key": False, + "results": 'JSON', +} + +categories = ['images'] + +paging = True +nb_per_page = 20 + +base_url = 'https://api.openverse.engineering/v1/images?' +search_string = '&page={page}&page_size={nb_per_page}&format=json&{query}' + + +def request(query, params): + + search_path = search_string.format(query=urlencode({'q': query}), nb_per_page=nb_per_page, page=params['pageno']) + + params['url'] = base_url + search_path + + return params + + +def response(resp): + results = [] + + json_data = loads(resp.text) + + for result in json_data['results']: + results.append( + { + 'url': result['foreign_landing_url'], + 'title': result['title'], + 'img_src': result['url'], + 'template': 'images.html', + } + ) + + return results -- cgit v1.2.3 From 4fc5e5299c06a942d3650f2e45ac0a11b51d917e Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 7 Jan 2022 14:08:19 +0100 Subject: [fix] ccengine engine - avoid unwanted redirects api.openverse.engineering is a little picky and wants to have a trailing slash in the path: /v1/images? -->/ v1/images/? otherwise it redirects, here is the debug log: DEBUG searx.network.openverse : HTTP Request: GET https://api.openverse.engineering/v1/images?&page=1&page_size=20&format=json&q=foo "HTTP/2 301 Moved Permanently" (text/html; charset=utf-8) DEBUG searx.network.openverse : HTTP Request: GET https://api.openverse.engineering/v1/images/?&page=1&page_size=20&format=json&q=foo "HTTP/2 200 OK" (application/json) WARNING searx.engines.openverse : ErrorContext('searx/search/processors/online.py', 105, 'count_error(', None, '1 redirects, maximum: 0', ('200', 'OK', 'api.openverse.engineering')) True Signed-off-by: Markus Heiser --- searx/engines/openverse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'searx/engines') diff --git a/searx/engines/openverse.py b/searx/engines/openverse.py index 0b12ecd5e..9f4636e41 100644 --- a/searx/engines/openverse.py +++ b/searx/engines/openverse.py @@ -23,8 +23,8 @@ categories = ['images'] paging = True nb_per_page = 20 -base_url = 'https://api.openverse.engineering/v1/images?' -search_string = '&page={page}&page_size={nb_per_page}&format=json&{query}' +base_url = 'https://api.openverse.engineering/v1/images/' +search_string = '?page={page}&page_size={nb_per_page}&format=json&{query}' def request(query, params): -- cgit v1.2.3