[fix] time range detection
commit350a84520d9da2499ffd5b0fbe6218692f2a330d
authorAdam Tauber <asciimoo@gmail.com>
dateTue 26 Jul 2016, 00:22 (10 years ago)
parent3a8d193
searx/engines/deviantart.py+1−2
@@ -13,7 +13,6 @@
1313"""
1414
1515from urllib import urlencode
16−from urlparse import urljoin
1716from lxml import html
1817import re
1918from searx.engines.xpath import extract_text
@@ -39,7 +38,7 @@ def request(query, params):
3938
4039 params['url'] = search_url.format(offset=offset,
4140 query=urlencode({'q': query}))
42− if params['time_range']:
41+ if params['time_range'] in time_range_dict:
4342 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
4443
4544 return params
searx/engines/duckduckgo.py+1−1
@@ -67,7 +67,7 @@ def request(query, params):
6767 params['url'] = url.format(
6868 query=urlencode({'q': query}), offset=offset)
6969
70− if params['time_range']:
70+ if params['time_range'] in time_range_dict:
7171 params['url'] += time_range_url.format(range=time_range_dict[params['time_range']])
7272
7373 return params
searx/engines/google.py+1−1
@@ -185,7 +185,7 @@ def request(query, params):
185185 query=urlencode({'q': query}),
186186 hostname=google_hostname,
187187 lang=url_lang)
188− if params['time_range']:
188+ if params['time_range'] in time_range_dict:
189189 params['url'] += time_range_search.format(range=time_range_dict[params['time_range']])
190190
191191 params['headers']['Accept-Language'] = language
searx/engines/google_images.py+1−2
@@ -11,7 +11,6 @@
1111"""
1212
1313from urllib import urlencode
14−from urlparse import parse_qs
1514from json import loads
1615from lxml import html
1716
@@ -39,7 +38,7 @@ def request(query, params):
3938 params['url'] = search_url.format(query=urlencode({'q': query}),
4039 offset=offset,
4140 safesearch=safesearch)
42− if params['time_range']:
41+ if params['time_range'] in time_range_dict:
4342 params['url'] += time_range_search.format(range=time_range_dict[params['time_range']])
4443
4544 if safesearch and params['safesearch']:
searx/engines/yahoo.py+1−1
@@ -58,7 +58,7 @@ def parse_url(url_string):
5858
5959
6060def _get_url(query, offset, language, time_range):
61− if time_range:
61+ if time_range in time_range_dict:
6262 return base_url + search_url_with_time.format(offset=offset,
6363 query=urlencode({'p': query}),
6464 lang=language,
tests/unit/engines/test_deviantart.py+1
@@ -10,6 +10,7 @@ class TestDeviantartEngine(SearxTestCase):
1010 query = 'test_query'
1111 dicto = defaultdict(dict)
1212 dicto['pageno'] = 0
13+ dicto['time_range'] = ''
1314 params = deviantart.request(query, dicto)
1415 self.assertTrue('url' in params)
1516 self.assertTrue(query in params['url'])
tests/unit/engines/test_duckduckgo.py+1
@@ -12,6 +12,7 @@ class TestDuckduckgoEngine(SearxTestCase):
1212 dicto = defaultdict(dict)
1313 dicto['pageno'] = 1
1414 dicto['language'] = 'de_CH'
15+ dicto['time_range'] = ''
1516 params = duckduckgo.request(query, dicto)
1617 self.assertIn('url', params)
1718 self.assertIn(query, params['url'])
tests/unit/engines/test_google.py+1
@@ -19,6 +19,7 @@ class TestGoogleEngine(SearxTestCase):
1919 dicto = defaultdict(dict)
2020 dicto['pageno'] = 1
2121 dicto['language'] = 'fr_FR'
22+ dicto['time_range'] = ''
2223 params = google.request(query, dicto)
2324 self.assertIn('url', params)
2425 self.assertIn(query, params['url'])
tests/unit/engines/test_google_images.py+1
@@ -11,6 +11,7 @@ class TestGoogleImagesEngine(SearxTestCase):
1111 dicto = defaultdict(dict)
1212 dicto['pageno'] = 1
1313 dicto['safesearch'] = 1
14+ dicto['time_range'] = ''
1415 params = google_images.request(query, dicto)
1516 self.assertIn('url', params)
1617 self.assertIn(query, params['url'])
tests/unit/engines/test_yahoo.py+1
@@ -28,6 +28,7 @@ class TestYahooEngine(SearxTestCase):
2828 query = 'test_query'
2929 dicto = defaultdict(dict)
3030 dicto['pageno'] = 1
31+ dicto['time_range'] = ''
3132 dicto['language'] = 'fr_FR'
3233 params = yahoo.request(query, dicto)
3334 self.assertIn('url', params)