git.iko.soy/searx
on master help sign in
[fix] pep8
91f9973Thomas Pointhuber
searx/engines/mediawiki.py+7−4
compare with master
unifiedsplit
@@ -28,15 +28,17 @@ search_url = base_url + 'w/api.php?action=query'\
28 '&srprop=timestamp'\
28 '&srprop=timestamp'\
29 '&format=json'\
29 '&format=json'\
30 '&sroffset={offset}'\
30 '&sroffset={offset}'\
31− '&srlimit={limit}'
31+ '&srlimit={limit}' # noqa
32
32
33
33
34# do search-request
34# do search-request
35def request(query, params):
35def request(query, params):
36 offset = (params['pageno'] - 1) * number_of_results
36 offset = (params['pageno'] - 1) * number_of_results
37+
37 string_args = dict(query=urlencode({'srsearch': query}),
38 string_args = dict(query=urlencode({'srsearch': query}),
38− offset=offset,
39+ offset=offset,
39− limit=number_of_results)
40+ limit=number_of_results)
41+
40 format_strings = list(Formatter().parse(base_url))
42 format_strings = list(Formatter().parse(base_url))
41
43
42 if params['language'] == 'all':
44 if params['language'] == 'all':
@@ -67,7 +69,8 @@ def response(resp):
67
69
68 # parse results
70 # parse results
69 for result in search_results['query']['search']:
71 for result in search_results['query']['search']:
70− url = base_url.format(language=resp.search_params['language']) + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
72+ url = base_url.format(language=resp.search_params['language']) +\
73+ 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8'))
71
74
72 # append result
75 # append result
73 results.append({'url': url,
76 results.append({'url': url,
searx/engines/yacy.py+17−12
@@ -24,7 +24,11 @@ number_of_results = 5
24
24
25# search-url
25# search-url
26base_url = 'http://localhost:8090'
26base_url = 'http://localhost:8090'
27−search_url = '/yacysearch.json?{query}&startRecord={offset}&maximumRecords={limit}&contentdom={search_type}&resource=global'
27+search_url = '/yacysearch.json?{query}'\
28+ '&startRecord={offset}'\
29+ '&maximumRecords={limit}'\
30+ '&contentdom={search_type}'\
31+ '&resource=global' # noqa
28
32
29# yacy specific type-definitions
33# yacy specific type-definitions
30search_types = {'general': 'text',
34search_types = {'general': 'text',
@@ -39,10 +43,11 @@ def request(query, params):
39 offset = (params['pageno'] - 1) * number_of_results
43 offset = (params['pageno'] - 1) * number_of_results
40 search_type = search_types.get(params['category'], '0')
44 search_type = search_types.get(params['category'], '0')
41
45
46+ params['url'] = base_url +\
42− params['url'] = base_url + search_url.format(query=urlencode({'query': query}),
47+ search_url.format(query=urlencode({'query': query}),
43− offset=offset,
48+ offset=offset,
44− limit=number_of_results,
49+ limit=number_of_results,
45− search_type=search_type)
50+ search_type=search_type)
46
51
47 # add language tag if specified
52 # add language tag if specified
48 if params['language'] != 'all':
53 if params['language'] != 'all':
@@ -70,19 +75,19 @@ def response(resp):
70
75
71 # append result
76 # append result
72 results.append({'url': result['link'],
77 results.append({'url': result['link'],
73− 'title': result['title'],
78+ 'title': result['title'],
74− 'content': result['description'],
79+ 'content': result['description'],
75− 'publishedDate': publishedDate})
80+ 'publishedDate': publishedDate})
76
81
77 elif resp.search_params['category'] == 'images':
82 elif resp.search_params['category'] == 'images':
78 # parse image results
83 # parse image results
79 for result in search_results:
84 for result in search_results:
80 # append result
85 # append result
81 results.append({'url': result['url'],
86 results.append({'url': result['url'],
82− 'title': result['title'],
87+ 'title': result['title'],
83− 'content': '',
88+ 'content': '',
84− 'img_src': result['image'],
89+ 'img_src': result['image'],
85− 'template': 'images.html'})
90+ 'template': 'images.html'})
86
91
87 #TODO parse video, audio and file results
92 #TODO parse video, audio and file results
88
93