@@ -14,6 +14,7 @@
15from urllib import urlencode
15from urllib import urlencode
16from json import loads
16from json import loads
18from searx.engines import logger
19from searx.engines import logger
@@ -24,21 +25,31 @@ categories = ['images']
25url = 'https://www.flickr.com/'
26url = 'https://www.flickr.com/'
26search_url = url + 'search?{query}&page={page}'
27search_url = url + 'search?{query}&page={page}'
28+time_range_url = '&min_upload_date={start}&max_upload_date={end}'
27photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'
29photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}'
28regex = re.compile(r"\"search-photos-lite-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
30regex = re.compile(r"\"search-photos-lite-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL)
29image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')
31image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's')
31paging = True
33paging = True
34+time_range_support = True
35+time_range_dict = {'day': 60 * 60 * 24,
36+ 'week': 60 * 60 * 24 * 7,
37+ 'month': 60 * 60 * 24 * 7 * 4}
34def build_flickr_url(user_id, photo_id):
40def build_flickr_url(user_id, photo_id):
35 return photo_url.format(userid=user_id, photoid=photo_id)
41 return photo_url.format(userid=user_id, photoid=photo_id)
38−def request(query, params):
44+def _get_time_range_url(time_range):
39− params['url'] = search_url.format(query=urlencode({'text': query}),
45+ if time_range in time_range_dict:
40− page=params['pageno'])
46+ return time_range_url.format(start=time(), end=str(int(time()) - time_range_dict[time_range]))
50+def request(query, params):
51+ params['url'] = (search_url.format(query=urlencode({'text': query}), page=params['pageno'])
52+ + _get_time_range_url(params['time_range']))
42 return params
53 return params