337bd6d · searx · git.iko.soy

requirements.txt+1

compare with master

unifiedsplit

@@ -3,3 +3,4 @@ flask-babel

3grequests

4lxml

5pyyaml

6+python-dateutil

searx/engines/google_news.py+4−10

@@ -2,6 +2,7 @@

2

3from urllib import urlencode

4from json import loads

5+from dateutil import parser

5from datetime import datetime

6from datetime import datetime

6

7

7categories = ['news']

8categories = ['news']

@@ -32,16 +33,9 @@ def response(resp):

32 return []

33 return []

33

34

34 for result in search_res['responseData']['results']:

35 for result in search_res['responseData']['results']:

35−# S.149 (159), library.pdf

36+

36−# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700",

37+# Mon, 10 Mar 2014 16:26:15 -0700

37−# "%a, %d %b %Y %H:%M:%S %z")

38−# publishedDate = parse(result['publishedDate'])

38+ publishedDate = parser.parse(result['publishedDate'])

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

44− #publishedDate = publishedDate + utc_offset

45

39

46 results.append({'url': result['unescapedUrl'],

40 results.append({'url': result['unescapedUrl'],

47 'title': result['titleNoFormatting'],

41 'title': result['titleNoFormatting'],

searx/engines/yahoo_news.py+2−3

@@ -6,6 +6,7 @@ from searx.engines.xpath import extract_text, extract_url

6from searx.engines.yahoo import parse_url

7from datetime import datetime, timedelta

8import re

9+from dateutil import parser

9

10

10categories = ['news']

11categories = ['news']

11search_url = 'http://news.search.yahoo.com/search?{query}&b={offset}'

12search_url = 'http://news.search.yahoo.com/search?{query}&b={offset}'

@@ -52,9 +53,7 @@ def response(resp):

52 - timedelta(hours=int(timeNumbers[0]))\

53 - timedelta(hours=int(timeNumbers[0]))\

53 - timedelta(minutes=int(timeNumbers[1]))

54 - timedelta(minutes=int(timeNumbers[1]))

54 else:

55 else:

55− # TODO year in string possible?

56− publishedDate = datetime.strptime(publishedDate,

56+ publishedDate =parser.parse(publishedDate)

57− "%b %d %H:%M%p")

58

57

59 if publishedDate.year == 1900:

58 if publishedDate.year == 1900:

60 publishedDate = publishedDate.replace(year=datetime.now().year)

59 publishedDate = publishedDate.replace(year=datetime.now().year)

searx/engines/youtube.py+7

@@ -1,5 +1,7 @@

1from json import loads

2from urllib import urlencode

3+from dateutil import parser

4+from datetime import datetime

3

5

4categories = ['videos']

6categories = ['videos']

5

7

@@ -35,6 +37,10 @@ def response(resp):

35 content = ''

37 content = ''

36 thumbnail = ''

38 thumbnail = ''

37

39

40+#"2013-12-31T15:22:51.000Z"

41+ pubdate = result['published']['$t']

42+ publishedDate = parser.parse(pubdate)

43+

38 if result['media$group']['media$thumbnail']:

44 if result['media$group']['media$thumbnail']:

39 thumbnail = result['media$group']['media$thumbnail'][0]['url']

45 thumbnail = result['media$group']['media$thumbnail'][0]['url']

40 content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, thumbnail) # noqa

46 content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, thumbnail) # noqa

@@ -48,6 +54,7 @@ def response(resp):

48 'title': title,

54 'title': title,

49 'content': content,

55 'content': content,

50 'template': 'videos.html',

56 'template': 'videos.html',

57+ 'publishedDate': publishedDate,

51 'thumbnail': thumbnail})

58 'thumbnail': thumbnail})

52

59

53 return results

60 return results

setup.py+1

@@ -35,6 +35,7 @@ setup(

35 'lxml',

36 'pyyaml',

37 'setuptools',

38+ 'python-dateutil',

38 ],

39 ],

39 extras_require={

40 extras_require={

40 'test': [

41 'test': [