diff --git a/searx/engines/ccengine.py b/searx/engines/openverse.py similarity index 84% rename from searx/engines/ccengine.py rename to searx/engines/openverse.py index 6f3a5adb..e3fc0827 100644 --- a/searx/engines/ccengine.py +++ b/searx/engines/openverse.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later """ - Creative Commons search engine (Images) + Openverse (formerly known as: Creative Commons search engine) [Images] """ @@ -23,8 +23,8 @@ categories = ['images'] paging = True nb_per_page = 20 -base_url = 'https://api.creativecommons.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): diff --git a/searx/engines/yahoo.py b/searx/engines/yahoo.py index 591dd501..a6b77904 100644 --- a/searx/engines/yahoo.py +++ b/searx/engines/yahoo.py @@ -135,8 +135,7 @@ def response(resp): content = eval_xpath_getindex( result, './/div[contains(@class, "compText")]', 0, default='' ) - if content: - content = extract_text(content) + content = extract_text(content, allow_none=True) # append result results.append({'url': url, diff --git a/searx/settings.yml b/searx/settings.yml index ff4c6593..cc955311 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -295,10 +295,10 @@ engines: require_api_key: false results: HTML - - name : ccengine - engine : ccengine - categories : images - shortcut : cce + - name: openverse + engine: openverse + categories: images + shortcut: opv # - name : core.ac.uk # engine : core @@ -1638,8 +1638,9 @@ engines: - name: brave shortcut: brave engine: xpath - paging: false - search_url: https://search.brave.com/search?q={query} + paging: true + first_page_num: 0 + search_url: https://search.brave.com/search?q={query}&offset={pageno}&spellcheck=1 url_xpath: //div[@class="snippet fdb"]/a/@href title_xpath: //span[@class="snippet-title"] content_xpath: //p[1][@class="snippet-description"]