From acaef6600e34159d2edb7bf0ef6b5f34471136e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Bourrel?= Date: Thu, 5 Jul 2018 10:11:45 +0200 Subject: [PATCH 1/3] Update path to wikidata image --- searx/engines/wikidata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index fe53609c..ffc1c8d0 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -54,7 +54,7 @@ value_xpath = './/div[contains(@class,"wikibase-statementview-mainsnak")]'\ + '/*/div[contains(@class,"wikibase-snakview-value")]' language_fallback_xpath = '//sup[contains(@class,"wb-language-fallback-indicator")]' calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]' - +media_xpath = value_xpath + '//div[contains(@class,"commons-media-caption")]//a' def request(query, params): params['url'] = url_search.format( @@ -313,7 +313,7 @@ def add_image(result): for property_id in property_ids: image = result.xpath(property_xpath.replace('{propertyid}', property_id)) if image: - image_name = image[0].xpath(value_xpath) + image_name = image[0].xpath(media_xpath) image_src = url_image.replace('{filename}', extract_text(image_name[0])) return image_src From 7a474db61bd9ba9a08111758b058f81cb5175db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Bourrel?= Date: Fri, 6 Jul 2018 10:31:01 +0200 Subject: [PATCH 2/3] Fix formatting --- searx/engines/wikidata.py | 1 + 1 file changed, 1 insertion(+) diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py index ffc1c8d0..c315b30d 100644 --- a/searx/engines/wikidata.py +++ b/searx/engines/wikidata.py @@ -56,6 +56,7 @@ language_fallback_xpath = '//sup[contains(@class,"wb-language-fallback-indicator calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]' media_xpath = value_xpath + '//div[contains(@class,"commons-media-caption")]//a' + def request(query, params): params['url'] = url_search.format( query=urlencode({'search': query})) From 0a37f909900f3d4a04c963430c93977d2c96f520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Bourrel?= Date: Fri, 6 Jul 2018 11:15:43 +0200 Subject: [PATCH 3/3] Fix wikidata tests with updated path to media --- tests/unit/engines/test_wikidata.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/unit/engines/test_wikidata.py b/tests/unit/engines/test_wikidata.py index 545ef9ed..62a40978 100644 --- a/tests/unit/engines/test_wikidata.py +++ b/tests/unit/engines/test_wikidata.py @@ -123,9 +123,10 @@ class TestWikidataEngine(SearxTestCase):
- - image.png - +
+ image.png +
2,687 × 3,356; 1.22 MB +
@@ -156,9 +157,10 @@ class TestWikidataEngine(SearxTestCase):
- - icon.png - +
+ icon.png +
671 × 671; 18 KB
+
@@ -179,9 +181,10 @@ class TestWikidataEngine(SearxTestCase):
- - logo.png - +
+ logo.png +
170 × 170; 1 KB +