git.iko.soy/searx
on master help sign in
[enh] implement image support for swisscows engine
commit2d81079384706aab4c39efcc8a2c4267af4397a5 authorThomas Pointhuber <thomas.pointhuber@gmx.at> dateMon 1 Jun 2015, 12:30 (11 years ago) parentd923b2a
2 files changed+55−13
compare with master
unifiedsplit
searx/engines/swisscows.py+30−8 searx/tests/engines/test_swisscows.py+25−5
searx/engines/swisscows.py+30−8
@@ -1,5 +1,5 @@
11"""
2− Swisscows (Web)
2+ Swisscows (Web, Images)
33
44 @website https://swisscows.ch
55 @provide-api no
@@ -15,7 +15,7 @@ from urllib import urlencode, unquote
1515import re
1616
1717# engine dependent config
18−categories = ['general']
18+categories = ['general', 'images']
1919paging = True
2020language_support = True
2121
@@ -24,7 +24,7 @@ base_url = 'https://swisscows.ch/'
2424search_string = '?{query}&page={page}'
2525
2626# regex
27−regex_json = re.compile('initialData: {"Request":(.|\n)*}\]},\s*environment')
27+regex_json = re.compile('initialData: {"Request":(.|\n)*},\s*environment')
2828regex_json_remove_start = re.compile('^initialData:\s*')
2929regex_json_remove_end = re.compile(',\s*environment$')
3030regex_img_url_remove_start = re.compile('^https?://i\.swisscows\.ch/\?link=')
@@ -45,6 +45,10 @@ def request(query, params):
4545 'region': region}),
4646 page=params['pageno'])
4747
48+ # image search query is something like 'image?{query}&page={page}'
49+ if params['category'] == 'images':
50+ search_path = 'image' + search_path
51+
4852 params['url'] = base_url + search_path
4953
5054 return params
@@ -63,12 +67,30 @@ def response(resp):
6367 json_raw = regex_json_remove_end.sub('', regex_json_remove_start.sub('', json_regex.group()))
6468 json = loads(json_raw)
6569
66− # parse normal results
70+ # parse results
6771 for result in json['Results'].get('items', []):
68− # append result
69− results.append({'url': result['Url'].replace(u'\uE000', '').replace(u'\uE001', ''),
70− 'title': result['Title'].replace(u'\uE000', '').replace(u'\uE001', ''),
71− 'content': result['Description'].replace(u'\uE000', '').replace(u'\uE001', '')})
72+ result_title = result['Title'].replace(u'\uE000', '').replace(u'\uE001', '')
73+
74+ # parse image results
75+ if result.get('ContentType', '').startswith('image'):
76+ img_url = unquote(regex_img_url_remove_start.sub('', result['Url']))
77+
78+ # append result
79+ results.append({'url': result['SourceUrl'],
80+ 'title': result['Title'],
81+ 'content': '',
82+ 'img_src': img_url,
83+ 'template': 'images.html'})
84+
85+ # parse general results
86+ else:
87+ result_url = result['Url'].replace(u'\uE000', '').replace(u'\uE001', '')
88+ result_content = result['Description'].replace(u'\uE000', '').replace(u'\uE001', '')
89+
90+ # append result
91+ results.append({'url': result_url,
92+ 'title': result_title,
93+ 'content': result_content})
7294
7395 # parse images
7496 for result in json.get('Images', []):
searx/tests/engines/test_swisscows.py+25−5
@@ -51,7 +51,23 @@ class TestSwisscowsEngine(SearxTestCase):
5151 "Description":"\uE000This should\uE001 be the content.",
5252 "Url":"http://this.should.be.the.link/",
5353 "DisplayUrl":"www.\uE000this.should.be.the\uE001.link",
54− "Id":"782ef287-e439-451c-b380-6ebc14ba033d"}
54+ "Id":"782ef287-e439-451c-b380-6ebc14ba033d"},
55+ {"Title":"Datei:This should1.svg",
56+ "Url":"https://i.swisscows.ch/?link=http%3a%2f%2fts2.mm.This/should1.png",
57+ "SourceUrl":"http://de.wikipedia.org/wiki/Datei:This should1.svg",
58+ "DisplayUrl":"de.wikipedia.org/wiki/Datei:This should1.svg",
59+ "Width":950,
60+ "Height":534,
61+ "FileSize":92100,
62+ "ContentType":"image/jpeg",
63+ "Thumbnail":{
64+ "Url":"https://i.swisscows.ch/?link=http%3a%2f%2fts2.mm.This/should1.png",
65+ "ContentType":"image/jpeg",
66+ "Width":300,
67+ "Height":168,
68+ "FileSize":9134},
69+ "Id":"6a97a542-8f65-425f-b7f6-1178c3aba7be"
70+ }
5571 ],"TotalCount":55300,
5672 "Query":"This should "
5773 },
@@ -94,11 +110,15 @@ class TestSwisscowsEngine(SearxTestCase):
94110 response = mock.Mock(content=html)
95111 results = swisscows.response(response)
96112 self.assertEqual(type(results), list)
97− self.assertEqual(len(results), 2)
113+ self.assertEqual(len(results), 3)
98114 self.assertEqual(results[0]['title'], 'This should be the title')
99115 self.assertEqual(results[0]['url'], 'http://this.should.be.the.link/')
100116 self.assertEqual(results[0]['content'], 'This should be the content.')
101− self.assertEqual(results[1]['title'], 'Datei:This should.svg')
102− self.assertEqual(results[1]['url'], 'http://de.wikipedia.org/wiki/Datei:This should.svg')
103− self.assertEqual(results[1]['img_src'], 'http://ts2.mm.This/should.png')
117+ self.assertEqual(results[1]['title'], 'Datei:This should1.svg')
118+ self.assertEqual(results[1]['url'], 'http://de.wikipedia.org/wiki/Datei:This should1.svg')
119+ self.assertEqual(results[1]['img_src'], 'http://ts2.mm.This/should1.png')
104120 self.assertEqual(results[1]['template'], 'images.html')
121+ self.assertEqual(results[2]['title'], 'Datei:This should.svg')
122+ self.assertEqual(results[2]['url'], 'http://de.wikipedia.org/wiki/Datei:This should.svg')
123+ self.assertEqual(results[2]['img_src'], 'http://ts2.mm.This/should.png')
124+ self.assertEqual(results[2]['template'], 'images.html')