ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1342 from bourrel/fix_wikidata_image 

Update path to wikidata image
This commit is contained in:
Adam Tauber 2018-07-09 10:59:03 +02:00 committed by GitHub
parent 686a9428d4 0a37f90990
commit 736f0fff0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
searx/engines/wikidata.py
View File

@ -54,6 +54,7 @@ value_xpath = './/div[contains(@class,"wikibase-statementview-mainsnak")]'\
+ '/*/div[contains(@class,"wikibase-snakview-value")]' + '/*/div[contains(@class,"wikibase-snakview-value")]'
language_fallback_xpath = '//sup[contains(@class,"wb-language-fallback-indicator")]' language_fallback_xpath = '//sup[contains(@class,"wb-language-fallback-indicator")]'
calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]' calendar_name_xpath = './/sup[contains(@class,"wb-calendar-name")]'
media_xpath = value_xpath + '//div[contains(@class,"commons-media-caption")]//a'
def request(query, params): def request(query, params):
@ -313,7 +314,7 @@ def add_image(result):
for property_id in property_ids: for property_id in property_ids:
image = result.xpath(property_xpath.replace('{propertyid}', property_id)) image = result.xpath(property_xpath.replace('{propertyid}', property_id))
if image: 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])) image_src = url_image.replace('{filename}', extract_text(image_name[0]))
return image_src return image_src

21
tests/unit/engines/test_wikidata.py
View File

@ -123,9 +123,10 @@ class TestWikidataEngine(SearxTestCase):
<div class="wikibase-statementview-mainsnak"> <div class="wikibase-statementview-mainsnak">
<div> <div>
<div class="wikibase-snakview-value"> <div class="wikibase-snakview-value">
<a href="https://commons.wikimedia.org/wiki/File:image.png"> <div class="commons-media-caption">
image.png <a href="https://commons.wikimedia.org/wiki/File:image.png">image.png</a>
</a> <br/>2,687 &#215; 3,356; 1.22 MB
</div>
</div> </div>
</div> </div>
</div> </div>
@ -156,9 +157,10 @@ class TestWikidataEngine(SearxTestCase):
<div class="wikibase-statementview-mainsnak"> <div class="wikibase-statementview-mainsnak">
<div> <div>
<div class="wikibase-snakview-value"> <div class="wikibase-snakview-value">
<a href="https://commons.wikimedia.org/wiki/File:icon.png"> <div class="commons-media-caption">
icon.png <a href="https://commons.wikimedia.org/wiki/File:icon.png">icon.png</a>
</a> <br/>671 &#215; 671; 18 KB</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -179,9 +181,10 @@ class TestWikidataEngine(SearxTestCase):
<div class="wikibase-statementview-mainsnak"> <div class="wikibase-statementview-mainsnak">
<div> <div>
<div class="wikibase-snakview-value"> <div class="wikibase-snakview-value">
<a href="https://commons.wikimedia.org/wiki/File:logo.png"> <div class="commons-media-caption">
logo.png <a href="https://commons.wikimedia.org/wiki/File:logo.png">logo.png</a>
</a> <br/>170 &#215; 170; 1 KB
</div>
</div> </div>
</div> </div>
</div> </div>