git.iko.soy/searx
on master help sign in
add year to time range to engines which support "Last year"

Engines: * Bing images * Flickr (noapi) * Google * Google Images * Google News

commitc59c76e6ee14f0417ad55ecf0f888f62f34f1f6d authorNoémi Ványi <sitbackandwait@gmail.com> dateSun 11 Dec 2016, 16:39 (10 years ago) parent2fc1091
6 files changed+36−5
compare with master
unifiedsplit
searx/engines/bing_images.py+2−1 searx/engines/flickr_noapi.py+2−1 searx/engines/google.py+2−1 searx/engines/google_images.py+9−1 searx/engines/google_news.py+2−1 tests/unit/engines/test_youtube_noapi.py+19
searx/engines/bing_images.py+2−1
@@ -33,7 +33,8 @@ time_range_string = '&qft=+filterui:age-lt{interval}'
3333thumb_url = "https://www.bing.com/th?id={ihk}"
3434time_range_dict = {'day': '1440',
3535 'week': '10080',
36− 'month': '43200'}
36+ 'month': '43200',
37+ 'year': '525600'}
3738
3839# safesearch definitions
3940safesearch_types = {2: 'STRICT',
searx/engines/flickr_noapi.py+2−1
@@ -34,7 +34,8 @@ paging = True
3434time_range_support = True
3535time_range_dict = {'day': 60 * 60 * 24,
3636 'week': 60 * 60 * 24 * 7,
37− 'month': 60 * 60 * 24 * 7 * 4}
37+ 'month': 60 * 60 * 24 * 7 * 4,
38+ 'year': 60 * 60 * 24 * 7 * 52}
3839
3940
4041def build_flickr_url(user_id, photo_id):
searx/engines/google.py+2−1
@@ -95,7 +95,8 @@ search_url = ('https://{hostname}' +
9595time_range_search = "&tbs=qdr:{range}"
9696time_range_dict = {'day': 'd',
9797 'week': 'w',
98− 'month': 'm'}
98+ 'month': 'm',
99+ 'year': 'y'}
99100
100101# other URLs
101102map_hostname_start = 'maps.google.'
searx/engines/google_images.py+9−1
@@ -10,10 +10,12 @@
1010 @parse url, title, img_src
1111"""
1212
13+from datetime import date, timedelta
1314from urllib import urlencode
1415from json import loads
1516from lxml import html
1617
18+
1719# engine dependent config
1820categories = ['images']
1921paging = True
@@ -29,6 +31,7 @@ search_url = 'https://www.google.com/search'\
2931 '&yv=2'\
3032 '&{search_options}'
3133time_range_attr = "qdr:{range}"
34+time_range_custom_attr = "cdr:1,cd_min:{start},cd_max{end}"
3235time_range_dict = {'day': 'd',
3336 'week': 'w',
3437 'month': 'm'}
@@ -36,7 +39,6 @@ time_range_dict = {'day': 'd',
3639
3740# do search-request
3841def request(query, params):
39−
4042 search_options = {
4143 'ijn': params['pageno'] - 1,
4244 'start': (params['pageno'] - 1) * number_of_results
@@ -44,6 +46,12 @@ def request(query, params):
4446
4547 if params['time_range'] in time_range_dict:
4648 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)
4755
4856 if safesearch and params['safesearch']:
4957 search_options['safe'] = 'on'
searx/engines/google_news.py+2−1
@@ -29,7 +29,8 @@ search_url = 'https://www.google.com/search'\
2929time_range_attr = "qdr:{range}"
3030time_range_dict = {'day': 'd',
3131 'week': 'w',
32− 'month': 'm'}
32+ 'month': 'm',
33+ 'year': 'y'}
3334
3435
3536# do search-request
tests/unit/engines/test_youtube_noapi.py+19
@@ -17,6 +17,25 @@ class TestYoutubeNoAPIEngine(SearxTestCase):
1717 self.assertIn(query, params['url'])
1818 self.assertIn('youtube.com', params['url'])
1919
20+ def test_time_range_search(self):
21+ dicto = defaultdict(dict)
22+ query = 'test_query'
23+ dicto['time_range'] = 'year'
24+ params = youtube_noapi.request(query, dicto)
25+ self.assertIn('&sp=EgIIBQ%253D%253D', params['url'])
26+
27+ dicto['time_range'] = 'month'
28+ params = youtube_noapi.request(query, dicto)
29+ self.assertIn('&sp=EgIIBA%253D%253D', params['url'])
30+
31+ dicto['time_range'] = 'week'
32+ params = youtube_noapi.request(query, dicto)
33+ self.assertIn('&sp=EgIIAw%253D%253D', params['url'])
34+
35+ dicto['time_range'] = 'day'
36+ params = youtube_noapi.request(query, dicto)
37+ self.assertIn('&sp=EgIIAg%253D%253D', params['url'])
38+
2039 def test_response(self):
2140 self.assertRaises(AttributeError, youtube_noapi.response, None)
2241 self.assertRaises(AttributeError, youtube_noapi.response, [])