summaryrefslogtreecommitdiff
path: root/searx
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2024-03-03 19:00:02 +0100
committerMarkus Heiser <markus.heiser@darmarIT.de>2024-03-05 16:27:04 +0100
commitd97b84bea29d4336607312bb26c56a8d13acdb0c (patch)
treec970246746c6bf7425f8876c6e4919b0264be25a /searx
parentb7be53bb908fe0771a77f2efc715e49d40bced2f (diff)
downloadsearxng-d97b84bea29d4336607312bb26c56a8d13acdb0c.tar.gz
searxng-d97b84bea29d4336607312bb26c56a8d13acdb0c.zip
[fix] ddg engines (get_vqd) - the vqd value is no longer in the form
Closes: https://github.com/searxng/searxng/issues/3276 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx')
-rw-r--r--searx/engines/duckduckgo.py38
1 files changed, 14 insertions, 24 deletions
diff --git a/searx/engines/duckduckgo.py b/searx/engines/duckduckgo.py
index 5ae456b04..50f43ad9a 100644
--- a/searx/engines/duckduckgo.py
+++ b/searx/engines/duckduckgo.py
@@ -65,7 +65,7 @@ def cache_vqd(query, value):
c = redisdb.client()
if c:
logger.debug("cache vqd value: %s", value)
- key = 'SearXNG_ddg_vqd' + redislib.secret_hash(query)
+ key = 'SearXNG_ddg_web_vqd' + redislib.secret_hash(query)
c.set(key, value, ex=600)
@@ -105,27 +105,25 @@ def get_vqd(query):
- DuckDuckGo News: ``https://duckduckgo.com/news.js??q=...&vqd=...``
"""
- value = ''
+ value = None
c = redisdb.client()
if c:
- key = 'SearXNG_ddg_vqd' + redislib.secret_hash(query)
+ key = 'SearXNG_ddg_web_vqd' + redislib.secret_hash(query)
value = c.get(key)
if value or value == b'':
value = value.decode('utf-8')
logger.debug("re-use cached vqd value: %s", value)
return value
- query_url = 'https://lite.duckduckgo.com/lite/?{args}'.format(args=urlencode({'q': query}))
+ query_url = 'https://duckduckgo.com/?' + urlencode({'q': query})
res = get(query_url)
doc = lxml.html.fromstring(res.text)
- value = doc.xpath("//input[@name='vqd']/@value")
- if value:
- value = value[0]
- else:
- # Some search terms do not have results and therefore no vqd value. If
- # no vqd value can be determined for the search term, an empty string is
- # chached.
- value = ''
+ for script in doc.xpath("//script[@type='text/javascript']"):
+ script = script.text
+ if 'vqd="' in script:
+ value = script[script.index('vqd="') + 5 :]
+ value = value[: value.index('"')]
+ break
logger.debug("new vqd value: '%s'", value)
cache_vqd(query, value)
return value
@@ -228,10 +226,6 @@ def request(query, params):
# request needs a vqd argument
vqd = get_vqd(query)
- if not vqd:
- # some search terms do not have results and therefore no vqd value
- params['url'] = None
- return params
# quote ddg bangs
query_parts = []
@@ -260,14 +254,14 @@ def request(query, params):
# initial page does not have an offset
if params['pageno'] == 2:
- # second page does have an offset of 30
- offset = (params['pageno'] - 1) * 30
+ # second page does have an offset of 20
+ offset = (params['pageno'] - 1) * 20
params['data']['s'] = offset
params['data']['dc'] = offset + 1
elif params['pageno'] > 2:
- # third and following pages do have an offset of 30 + n*50
- offset = 30 + (params['pageno'] - 2) * 50
+ # third and following pages do have an offset of 20 + n*50
+ offset = 20 + (params['pageno'] - 2) * 50
params['data']['s'] = offset
params['data']['dc'] = offset + 1
@@ -322,10 +316,6 @@ def response(resp):
form_data['o'] = eval_xpath(form, '//input[@name="o"]/@value')[0]
logger.debug('form_data: %s', form_data)
- value = eval_xpath(form, '//input[@name="vqd"]/@value')[0]
- query = resp.search_params['data']['q']
- cache_vqd(query, value)
-
tr_rows = eval_xpath(result_table, './/tr')
# In the last <tr> is the form of the 'previous/next page' links
tr_rows = tr_rows[:-1]