git.iko.soy/searx
on master help sign in
Merge pull request #1342 from bourrel/fix_wikidata_image

Update path to wikidata image

commit736f0fff0eeaded50d02f2f989fc3a4c638b3d3c authorAdam Tauber <asciimoo@gmail.com> dateMon 9 Jul 2018, 10:59 (8 years ago) parent686a9420a37f90
2 files changed+14−10
compare with master
unifiedsplit
searx/engines/wikidata.py+2−1 tests/unit/engines/test_wikidata.py+12−9
searx/engines/wikidata.py+2−1
@@ -54,6 +54,7 @@ value_xpath = './/div[contains(@class,"wikibase-statementview-mainsnak")]'\
5454 + '/*/div[contains(@class,"wikibase-snakview-value")]'
5555language_fallback_xpath = '//sup[contains(@class,"wb-language-fallback-indicator")]'
5656calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]'
57+media_xpath = value_xpath + '//div[contains(@class,"commons-media-caption")]//a'
5758
5859
5960def request(query, params):
@@ -313,7 +314,7 @@ def add_image(result):
313314 for property_id in property_ids:
314315 image = result.xpath(property_xpath.replace('{propertyid}', property_id))
315316 if image:
316− image_name = image[0].xpath(value_xpath)
317+ image_name = image[0].xpath(media_xpath)
317318 image_src = url_image.replace('{filename}', extract_text(image_name[0]))
318319 return image_src
319320
tests/unit/engines/test_wikidata.py+12−9
@@ -123,9 +123,10 @@ class TestWikidataEngine(SearxTestCase):
123123 <div class="wikibase-statementview-mainsnak">
124124 <div>
125125 <div class="wikibase-snakview-value">
126− <a href="https://commons.wikimedia.org/wiki/File:image.png">
127− image.png
128− </a>
126+ <div class="commons-media-caption">
127+ <a href="https://commons.wikimedia.org/wiki/File:image.png">image.png</a>
128+ <br/>2,687 &#215; 3,356; 1.22 MB
129+ </div>
129130 </div>
130131 </div>
131132 </div>
@@ -156,9 +157,10 @@ class TestWikidataEngine(SearxTestCase):
156157 <div class="wikibase-statementview-mainsnak">
157158 <div>
158159 <div class="wikibase-snakview-value">
159− <a href="https://commons.wikimedia.org/wiki/File:icon.png">
160− icon.png
161− </a>
160+ <div class="commons-media-caption">
161+ <a href="https://commons.wikimedia.org/wiki/File:icon.png">icon.png</a>
162+ <br/>671 &#215; 671; 18 KB</div>
163+ </div>
162164 </div>
163165 </div>
164166 </div>
@@ -179,9 +181,10 @@ class TestWikidataEngine(SearxTestCase):
179181 <div class="wikibase-statementview-mainsnak">
180182 <div>
181183 <div class="wikibase-snakview-value">
182− <a href="https://commons.wikimedia.org/wiki/File:logo.png">
183− logo.png
184− </a>
184+ <div class="commons-media-caption">
185+ <a href="https://commons.wikimedia.org/wiki/File:logo.png">logo.png</a>
186+ <br/>170 &#215; 170; 1 KB
187+ </div>
185188 </div>
186189 </div>
187190 </div>