Merge pull request #2560 from dalf/fix-duckduckgo

Fix duckduckgo
This commit is contained in:
Alexandre Flament 2021-02-12 10:56:40 +01:00 committed by GitHub
commit 7e83818879
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 13 deletions

View file

@ -5,7 +5,8 @@
from lxml.html import fromstring
from json import loads
from searx.utils import extract_text, match_language, eval_xpath
from searx.utils import extract_text, match_language, eval_xpath, dict_subset
from searx.poolrequests import get
# about
about = {
@ -35,6 +36,7 @@ language_aliases = {
# search-url
url = 'https://html.duckduckgo.com/html'
url_ping = 'https://duckduckgo.com/t/sl_h'
time_range_dict = {'day': 'd',
'week': 'w',
'month': 'm'}
@ -65,27 +67,27 @@ def request(query, params):
params['url'] = url
params['method'] = 'POST'
params['data']['b'] = ''
params['data']['q'] = query
params['data']['df'] = ''
params['data']['b'] = ''
region_code = get_region_code(params['language'], supported_languages)
if region_code:
params['data']['kl'] = region_code
params['cookies']['kl'] = region_code
if params['time_range'] in time_range_dict:
params['data']['df'] = time_range_dict[params['time_range']]
params['data']['df'] = time_range_dict.get(params['time_range'], '')
return params
# get response from search-request
def response(resp):
# ping
headers_ping = dict_subset(resp.request.headers, ['User-Agent', 'Accept-Encoding', 'Accept', 'Cookie'])
get(url_ping, headers=headers_ping)
# parse the response
results = []
doc = fromstring(resp.text)
# parse results
for i, r in enumerate(eval_xpath(doc, result_xpath)):
if i >= 30:
break

View file

@ -1,7 +1,7 @@
import sys
from time import time
from itertools import cycle
from threading import RLock, local
from threading import local
import requests
@ -88,10 +88,12 @@ class SessionSinglePool(requests.Session):
super().__init__()
# reuse the same adapters
with RLock():
self.adapters.clear()
self.mount('https://', next(https_adapters))
self.mount('http://', next(http_adapters))
self.adapters.clear()
https_adapter = threadLocal.__dict__.setdefault('https_adapter', next(https_adapters))
http_adapter = threadLocal.__dict__.setdefault('http_adapter', next(http_adapters))
self.mount('https://', https_adapter)
self.mount('http://', http_adapter)
def close(self):
"""Call super, but clear adapters since there are managed globaly"""