git.iko.soy/searx
on master help sign in
[fix] pep8
commitb735093564d7ce6f67ccac39636a842b842c1b64 authorAdam Tauber <asciimoo@gmail.com> dateSat 15 Mar 2014, 20:20 (13 years ago) parent1467a2e
3 files changed+26−15
compare with master
unifiedsplit
searx/engines/google_news.py+9−5 searx/engines/yahoo_news.py+12−5 searx/webapp.py+5−5
searx/engines/google_news.py+9−5
@@ -2,7 +2,7 @@
22
33from urllib import urlencode
44from json import loads
5−from datetime import datetime, timedelta
5+from datetime import datetime
66
77categories = ['news']
88
@@ -33,14 +33,18 @@ def response(resp):
3333
3434 for result in search_res['responseData']['results']:
3535# S.149 (159), library.pdf
36−# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700", "%a, %d %b %Y %H:%M:%S %z")
36+# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700",
37+# "%a, %d %b %Y %H:%M:%S %z")
3738# publishedDate = parse(result['publishedDate'])
38− publishedDate = datetime.strptime(str.join(' ',result['publishedDate'].split(None)[0:5]), "%a, %d %b %Y %H:%M:%S")
39− #utc_offset = timedelta(result['publishedDate'].split(None)[5]) # local = utc + offset
39+ publishedDate = datetime.strptime(
40+ str.join(' ', result['publishedDate'].split(None)[0:5]),
41+ "%a, %d %b %Y %H:%M:%S")
42+ #utc_offset = timedelta(result['publishedDate'].split(None)[5])
43+ # local = utc + offset
4044 #publishedDate = publishedDate + utc_offset
4145
4246 results.append({'url': result['unescapedUrl'],
4347 'title': result['titleNoFormatting'],
44− 'publishedDate': publishedDate,
48+ 'publishedDate': publishedDate,
4549 'content': result['content']})
4650 return results
searx/engines/yahoo_news.py+12−5
@@ -43,19 +43,26 @@ def response(resp):
4343 publishedDate = extract_text(result.xpath(publishedDate_xpath)[0])
4444
4545 if re.match("^[0-9]+ minute(s|) ago$", publishedDate):
46− publishedDate = datetime.now() - timedelta(minutes=int(re.match(r'\d+', publishedDate).group()))
46+ publishedDate = datetime.now() - timedelta(minutes=int(re.match(r'\d+', publishedDate).group())) # noqa
4747 else:
48− if re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", publishedDate):
48+ if re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$",
49+ publishedDate):
4950 timeNumbers = re.findall(r'\d+', publishedDate)
50− publishedDate = datetime.now() - timedelta(hours=int(timeNumbers[0])) - timedelta(minutes=int(timeNumbers[1]))
51+ publishedDate = datetime.now()\
52+ - timedelta(hours=int(timeNumbers[0]))\
53+ - timedelta(minutes=int(timeNumbers[1]))
5154 else:
5255 # TODO year in string possible?
53− publishedDate = datetime.strptime(publishedDate,"%b %d %H:%M%p")
56+ publishedDate = datetime.strptime(publishedDate,
57+ "%b %d %H:%M%p")
5458
5559 if publishedDate.year == 1900:
5660 publishedDate = publishedDate.replace(year=datetime.now().year)
5761
58− results.append({'url': url, 'title': title, 'content': content,'publishedDate':publishedDate})
62+ results.append({'url': url,
63+ 'title': title,
64+ 'content': content,
65+ 'publishedDate': publishedDate})
5966
6067 if not suggestion_xpath:
6168 return results
searx/webapp.py+5−5
@@ -32,7 +32,7 @@ from flask import (
3232 Flask, request, render_template, url_for, Response, make_response,
3333 redirect, send_from_directory
3434)
35−from flask.ext.babel import Babel, gettext, ngettext, format_date
35+from flask.ext.babel import Babel, gettext, format_date
3636from searx import settings, searx_dir
3737from searx.engines import (
3838 search as do_search, categories, engines, get_engines_stats,
@@ -161,12 +161,12 @@ def index():
161161 if 'publishedDate' in result:
162162 if result['publishedDate'] >= datetime.now() - timedelta(days=1):
163163 timedifference = datetime.now() - result['publishedDate']
164− minutes = int((timedifference.seconds/60)%60)
165− hours = int(timedifference.seconds/60/60)
164+ minutes = int((timedifference.seconds / 60) % 60)
165+ hours = int(timedifference.seconds / 60 / 60)
166166 if hours == 0:
167− result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)
167+ result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes) # noqa
168168 else:
169− result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)
169+ result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes) # noqa
170170 else:
171171 result['publishedDate'] = format_date(result['publishedDate'])
172172