|
@@ -10,10 +10,12 @@
|
10
|
10
|
@parse url, title, img_src
|
11
|
11
|
"""
|
12
|
12
|
|
|
13
|
+from datetime import date, timedelta
|
13
|
14
|
from urllib import urlencode
|
14
|
15
|
from json import loads
|
15
|
16
|
from lxml import html
|
16
|
17
|
|
|
18
|
+
|
17
|
19
|
# engine dependent config
|
18
|
20
|
categories = ['images']
|
19
|
21
|
paging = True
|
|
@@ -29,6 +31,7 @@ search_url = 'https://www.google.com/search'\
|
29
|
31
|
'&yv=2'\
|
30
|
32
|
'&{search_options}'
|
31
|
33
|
time_range_attr = "qdr:{range}"
|
|
34
|
+time_range_custom_attr = "cdr:1,cd_min:{start},cd_max{end}"
|
32
|
35
|
time_range_dict = {'day': 'd',
|
33
|
36
|
'week': 'w',
|
34
|
37
|
'month': 'm'}
|
|
@@ -36,7 +39,6 @@ time_range_dict = {'day': 'd',
|
36
|
39
|
|
37
|
40
|
# do search-request
|
38
|
41
|
def request(query, params):
|
39
|
|
-
|
40
|
42
|
search_options = {
|
41
|
43
|
'ijn': params['pageno'] - 1,
|
42
|
44
|
'start': (params['pageno'] - 1) * number_of_results
|
|
@@ -44,6 +46,12 @@ def request(query, params):
|
44
|
46
|
|
45
|
47
|
if params['time_range'] in time_range_dict:
|
46
|
48
|
search_options['tbs'] = time_range_attr.format(range=time_range_dict[params['time_range']])
|
|
49
|
+ elif params['time_range'] == 'year':
|
|
50
|
+ now = date.today()
|
|
51
|
+ then = now - timedelta(days=365)
|
|
52
|
+ start = then.strftime('%m/%d/%Y')
|
|
53
|
+ end = now.strftime('%m/%d/%Y')
|
|
54
|
+ search_options['tbs'] = time_range_custom_attr.format(start=start, end=end)
|
47
|
55
|
|
48
|
56
|
if safesearch and params['safesearch']:
|
49
|
57
|
search_options['safe'] = 'on'
|