mirror of https://github.com/searx/searx
add year filter to engines with time range support && tests
Following engines does not support "Last year": * Bing News * DeviantArt * DuckDuckGo * Yahoo * YouTube (noapi)
This commit is contained in:
parent
c59c76e6ee
commit
b034356825
|
@ -66,6 +66,9 @@ def _get_url(query, language, offset, time_range):
|
||||||
|
|
||||||
# do search-request
|
# do search-request
|
||||||
def request(query, params):
|
def request(query, params):
|
||||||
|
if params['time_range'] and params['time_range'] not in time_range_dict:
|
||||||
|
return params
|
||||||
|
|
||||||
offset = (params['pageno'] - 1) * 10 + 1
|
offset = (params['pageno'] - 1) * 10 + 1
|
||||||
|
|
||||||
if params['language'] == 'all':
|
if params['language'] == 'all':
|
||||||
|
|
|
@ -34,6 +34,9 @@ time_range_dict = {'day': 11,
|
||||||
|
|
||||||
# do search-request
|
# do search-request
|
||||||
def request(query, params):
|
def request(query, params):
|
||||||
|
if params['time_range'] and params['time_range'] not in time_range_dict:
|
||||||
|
return params
|
||||||
|
|
||||||
offset = (params['pageno'] - 1) * 24
|
offset = (params['pageno'] - 1) * 24
|
||||||
|
|
||||||
params['url'] = search_url.format(offset=offset,
|
params['url'] = search_url.format(offset=offset,
|
||||||
|
|
|
@ -41,6 +41,9 @@ content_xpath = './/a[@class="result__snippet"]'
|
||||||
|
|
||||||
# do search-request
|
# do search-request
|
||||||
def request(query, params):
|
def request(query, params):
|
||||||
|
if params['time_range'] and params['time_range'] not in time_range_dict:
|
||||||
|
return params
|
||||||
|
|
||||||
offset = (params['pageno'] - 1) * 30
|
offset = (params['pageno'] - 1) * 30
|
||||||
|
|
||||||
if params['language'] == 'all':
|
if params['language'] == 'all':
|
||||||
|
|
|
@ -77,6 +77,9 @@ def _get_language(params):
|
||||||
|
|
||||||
# do search-request
|
# do search-request
|
||||||
def request(query, params):
|
def request(query, params):
|
||||||
|
if params['time_range'] and params['time_range'] not in time_range_dict:
|
||||||
|
return params
|
||||||
|
|
||||||
offset = (params['pageno'] - 1) * 10 + 1
|
offset = (params['pageno'] - 1) * 10 + 1
|
||||||
language = _get_language(params)
|
language = _get_language(params)
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,8 @@ search_url = base_url + '?search_query={query}&page={page}'
|
||||||
time_range_url = '&sp=EgII{time_range}%253D%253D'
|
time_range_url = '&sp=EgII{time_range}%253D%253D'
|
||||||
time_range_dict = {'day': 'Ag',
|
time_range_dict = {'day': 'Ag',
|
||||||
'week': 'Aw',
|
'week': 'Aw',
|
||||||
'month': 'BA'}
|
'month': 'BA',
|
||||||
|
'year': 'BQ'}
|
||||||
|
|
||||||
embedded_url = '<iframe width="540" height="304" ' +\
|
embedded_url = '<iframe width="540" height="304" ' +\
|
||||||
'data-src="//www.youtube-nocookie.com/embed/{videoid}" ' +\
|
'data-src="//www.youtube-nocookie.com/embed/{videoid}" ' +\
|
||||||
|
|
|
@ -23,6 +23,13 @@ class TestBingNewsEngine(SearxTestCase):
|
||||||
params = bing_news.request(query, dicto)
|
params = bing_news.request(query, dicto)
|
||||||
self.assertIn('en', params['url'])
|
self.assertIn('en', params['url'])
|
||||||
|
|
||||||
|
def test_no_url_in_request_year_time_range(self):
|
||||||
|
dicto = defaultdict(dict)
|
||||||
|
query = 'test_query'
|
||||||
|
dicto['time_range'] = 'year'
|
||||||
|
params = bing_news.request(query, dicto)
|
||||||
|
self.assertEqual({}, params['url'])
|
||||||
|
|
||||||
def test_response(self):
|
def test_response(self):
|
||||||
self.assertRaises(AttributeError, bing_news.response, None)
|
self.assertRaises(AttributeError, bing_news.response, None)
|
||||||
self.assertRaises(AttributeError, bing_news.response, [])
|
self.assertRaises(AttributeError, bing_news.response, [])
|
||||||
|
|
|
@ -7,8 +7,8 @@ from searx.testing import SearxTestCase
|
||||||
class TestDeviantartEngine(SearxTestCase):
|
class TestDeviantartEngine(SearxTestCase):
|
||||||
|
|
||||||
def test_request(self):
|
def test_request(self):
|
||||||
query = 'test_query'
|
|
||||||
dicto = defaultdict(dict)
|
dicto = defaultdict(dict)
|
||||||
|
query = 'test_query'
|
||||||
dicto['pageno'] = 0
|
dicto['pageno'] = 0
|
||||||
dicto['time_range'] = ''
|
dicto['time_range'] = ''
|
||||||
params = deviantart.request(query, dicto)
|
params = deviantart.request(query, dicto)
|
||||||
|
@ -16,6 +16,13 @@ class TestDeviantartEngine(SearxTestCase):
|
||||||
self.assertTrue(query in params['url'])
|
self.assertTrue(query in params['url'])
|
||||||
self.assertTrue('deviantart.com' in params['url'])
|
self.assertTrue('deviantart.com' in params['url'])
|
||||||
|
|
||||||
|
def test_no_url_in_request_year_time_range(self):
|
||||||
|
dicto = defaultdict(dict)
|
||||||
|
query = 'test_query'
|
||||||
|
dicto['time_range'] = 'year'
|
||||||
|
params = deviantart.request(query, dicto)
|
||||||
|
self.assertEqual({}, params['url'])
|
||||||
|
|
||||||
def test_response(self):
|
def test_response(self):
|
||||||
self.assertRaises(AttributeError, deviantart.response, None)
|
self.assertRaises(AttributeError, deviantart.response, None)
|
||||||
self.assertRaises(AttributeError, deviantart.response, [])
|
self.assertRaises(AttributeError, deviantart.response, [])
|
||||||
|
|
|
@ -19,6 +19,13 @@ class TestDuckduckgoEngine(SearxTestCase):
|
||||||
self.assertIn('duckduckgo.com', params['url'])
|
self.assertIn('duckduckgo.com', params['url'])
|
||||||
self.assertIn('ch-de', params['url'])
|
self.assertIn('ch-de', params['url'])
|
||||||
|
|
||||||
|
def test_no_url_in_request_year_time_range(self):
|
||||||
|
dicto = defaultdict(dict)
|
||||||
|
query = 'test_query'
|
||||||
|
dicto['time_range'] = 'year'
|
||||||
|
params = duckduckgo.request(query, dicto)
|
||||||
|
self.assertEqual({}, params['url'])
|
||||||
|
|
||||||
def test_response(self):
|
def test_response(self):
|
||||||
self.assertRaises(AttributeError, duckduckgo.response, None)
|
self.assertRaises(AttributeError, duckduckgo.response, None)
|
||||||
self.assertRaises(AttributeError, duckduckgo.response, [])
|
self.assertRaises(AttributeError, duckduckgo.response, [])
|
||||||
|
|
|
@ -46,6 +46,13 @@ class TestYahooEngine(SearxTestCase):
|
||||||
self.assertIn('en', params['cookies']['sB'])
|
self.assertIn('en', params['cookies']['sB'])
|
||||||
self.assertIn('en', params['url'])
|
self.assertIn('en', params['url'])
|
||||||
|
|
||||||
|
def test_no_url_in_request_year_time_range(self):
|
||||||
|
dicto = defaultdict(dict)
|
||||||
|
query = 'test_query'
|
||||||
|
dicto['time_range'] = 'year'
|
||||||
|
params = yahoo.request(query, dicto)
|
||||||
|
self.assertEqual({}, params['url'])
|
||||||
|
|
||||||
def test_response(self):
|
def test_response(self):
|
||||||
self.assertRaises(AttributeError, yahoo.response, None)
|
self.assertRaises(AttributeError, yahoo.response, None)
|
||||||
self.assertRaises(AttributeError, yahoo.response, [])
|
self.assertRaises(AttributeError, yahoo.response, [])
|
||||||
|
|
Loading…
Reference in New Issue