git.iko.soy/searx
on master help sign in
[fix] pep8
commita508d540ac43196edeb4d946dfdf64a1d0a438ed authorThomas Pointhuber <thomas.pointhuber@gmx.at> dateTue 16 Dec 2014, 17:26 (12 years ago) parent91f9973
6 files changed+35−17
compare with master
unifiedsplit
searx/engines/bing_news.py+8−3 searx/engines/faroo.py+11−4 searx/engines/google_images.py+1−1 searx/engines/kickass.py+4−4 searx/engines/soundcloud.py+6−1 searx/engines/yahoo.py+5−4
searx/engines/bing_news.py+8−3
@@ -57,12 +57,16 @@ def response(resp):
5757 link = result.xpath('.//div[@class="newstitle"]/a')[0]
5858 url = link.attrib.get('href')
5959 title = ' '.join(link.xpath('.//text()'))
60− contentXPath = result.xpath('.//div[@class="sn_txt"]/div//span[@class="sn_snip"]//text()')
60+ contentXPath = result.xpath('.//div[@class="sn_txt"]/div'
61+ '//span[@class="sn_snip"]//text()')
6162 if contentXPath is not None:
6263 content = escape(' '.join(contentXPath))
6364
6465 # parse publishedDate
65− publishedDateXPath = result.xpath('.//div[@class="sn_txt"]/div//span[contains(@class,"sn_ST")]//span[contains(@class,"sn_tm")]//text()')
66+ publishedDateXPath = result.xpath('.//div[@class="sn_txt"]/div'
67+ '//span[contains(@class,"sn_ST")]'
68+ '//span[contains(@class,"sn_tm")]'
69+ '//text()')
6670 if publishedDateXPath is not None:
6771 publishedDate = escape(' '.join(publishedDateXPath))
6872
@@ -74,7 +78,8 @@ def response(resp):
7478 timeNumbers = re.findall(r'\d+', publishedDate)
7579 publishedDate = datetime.now()\
7680 - timedelta(hours=int(timeNumbers[0]))
77− elif re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", publishedDate):
81+ elif re.match("^[0-9]+ hour(s|),"
82+ " [0-9]+ minute(s|) ago$", publishedDate):
7883 timeNumbers = re.findall(r'\d+', publishedDate)
7984 publishedDate = datetime.now()\
8085 - timedelta(hours=int(timeNumbers[0]))\
searx/engines/faroo.py+11−4
@@ -22,10 +22,17 @@ api_key = None
2222
2323# search-url
2424url = 'http://www.faroo.com/'
25−search_url = url + 'api?{query}&start={offset}&length={number_of_results}&l={language}&src={categorie}&i=false&f=json&key={api_key}'
25+search_url = url + 'api?{query}'\
26+ '&start={offset}'\
27+ '&length={number_of_results}'\
28+ '&l={language}'\
29+ '&src={categorie}'\
30+ '&i=false'\
31+ '&f=json'\
32+ '&key={api_key}' # noqa
2633
2734search_category = {'general': 'web',
28− 'news': 'news'}
35+ 'news': 'news'}
2936
3037
3138# do search-request
@@ -80,8 +87,8 @@ def response(resp):
8087 # parse results
8188 for result in search_res['results']:
8289 if result['news']:
83− # timestamp (how many milliseconds have passed between now and the beginning of 1970)
84− publishedDate = datetime.datetime.fromtimestamp(result['date']/1000.0)
90+ # timestamp (milliseconds since 1970)
91+ publishedDate = datetime.datetime.fromtimestamp(result['date']/1000.0) # noqa
8592
8693 # append news result
8794 results.append({'url': result['url'],
searx/engines/google_images.py+1−1
@@ -9,7 +9,7 @@
99# @stable yes (but deprecated)
1010# @parse url, title, img_src
1111
12−from urllib import urlencode,unquote
12+from urllib import urlencode, unquote
1313from json import loads
1414
1515# engine dependent config
searx/engines/kickass.py+4−4
@@ -1,8 +1,8 @@
11## Kickass Torrent (Videos, Music, Files)
2−#
2+#
33# @website https://kickass.so
44# @provide-api no (nothing found)
5−#
5+#
66# @using-api no
77# @results HTML (using search portal)
88# @stable yes (HTML can change)
@@ -13,7 +13,6 @@ from cgi import escape
1313from urllib import quote
1414from lxml import html
1515from operator import itemgetter
16−from dateutil import parser
1716
1817# engine dependent config
1918categories = ['videos', 'music', 'files']
@@ -33,7 +32,8 @@ def request(query, params):
3332 params['url'] = search_url.format(search_term=quote(query),
3433 pageno=params['pageno'])
3534
36− # FIX: SSLError: hostname 'kickass.so' doesn't match either of '*.kickass.to', 'kickass.to'
35+ # FIX: SSLError: hostname 'kickass.so'
36+ # doesn't match either of '*.kickass.to', 'kickass.to'
3737 params['verify'] = False
3838
3939 return params
searx/engines/soundcloud.py+6−1
@@ -20,7 +20,12 @@ guest_client_id = 'b45b1aa10f1ac2941910a7f0d10f8e28'
2020
2121# search-url
2222url = 'https://api.soundcloud.com/'
23−search_url = url + 'search?{query}&facet=model&limit=20&offset={offset}&linked_partitioning=1&client_id={client_id}'
23+search_url = url + 'search?{query}'\
24+ '&facet=model'\
25+ '&limit=20'\
26+ '&offset={offset}'\
27+ '&linked_partitioning=1'\
28+ '&client_id={client_id}' # noqa
2429
2530
2631# do search-request
searx/engines/yahoo.py+5−4
@@ -20,7 +20,8 @@ paging = True
2020language_support = True
2121
2222# search-url
23−search_url = 'https://search.yahoo.com/search?{query}&b={offset}&fl=1&vl=lang_{lang}'
23+base_url = 'https://search.yahoo.com/'
24+search_url = 'search?{query}&b={offset}&fl=1&vl=lang_{lang}'
2425
2526# specific xpath variables
2627results_xpath = '//div[@class="res"]'
@@ -57,9 +58,9 @@ def request(query, params):
5758 else:
5859 language = params['language'].split('_')[0]
5960
60− params['url'] = search_url.format(offset=offset,
61− query=urlencode({'p': query}),
62− lang=language)
61+ params['url'] = base_url + search_url.format(offset=offset,
62+ query=urlencode({'p': query}),
63+ lang=language)
6364
6465 # TODO required?
6566 params['cookies']['sB'] = 'fl=1&vl=lang_{lang}&sh=1&rw=new&v=1'\