on master help sign in
Fix conflicts
commit599ff39ddf91223cde4a1bd2a20d66bf80cd99e0 authorPlague Doctor <plague@privacyrequired.com> dateFri 9 Apr 2021, 06:54 (6 years ago) parent6631f11cc35934
4 files changed+90−1
requirements-dev.txt+1 searx/engines/wordnik.py+77 searx/settings.yml+8 searx/webapp.py+4−1
requirements-dev.txt+1
@@ -8,6 +8,7 @@ transifex-client==0.14.2
88selenium==3.141.0
99twine==3.4.1
1010Pallets-Sphinx-Themes==1.2.3
11+docutils==0.16
1112Sphinx==3.5.3
1213sphinx-issues==1.2.0
1314sphinx-jinja==1.1.1
searx/engines/wordnik.pynew file+77
@@ -0,0 +1,77 @@
1+# SPDX-License-Identifier: AGPL-3.0-or-later
2+"""Wordnik (general)
3+
4+"""
5+
6+from lxml.html import fromstring
7+from searx import logger
8+from searx.utils import extract_text
9+from searx.raise_for_httperror import raise_for_httperror
10+
11+logger = logger.getChild('Wordnik engine')
12+
13+# about
14+about = {
15+ "website": 'https://www.wordnik.com',
16+ "wikidata_id": 'Q8034401',
17+ "official_api_documentation": None,
18+ "use_official_api": False,
19+ "require_api_key": False,
20+ "results": 'HTML',
21+}
22+
23+categories = ['general']
24+paging = False
25+
26+URL = 'https://www.wordnik.com'
27+SEARCH_URL = URL + '/words/{query}'
28+
29+
30+def request(query, params):
31+ params['url'] = SEARCH_URL.format(query=query)
32+ logger.debug(f"query_url --> {params['url']}")
33+ return params
34+
35+
36+def response(resp):
37+ results = []
38+
39+ raise_for_httperror(resp)
40+ dom = fromstring(resp.text)
41+ word = extract_text(dom.xpath('//*[@id="headword"]/text()'))
42+
43+ definitions = []
44+ for src in dom.xpath('//*[@id="define"]//h3[@class="source"]'):
45+ src_text = extract_text(src).strip()
46+ if src_text.startswith('from '):
47+ src_text = src_text[5:]
48+
49+ src_defs = []
50+ for def_item in src.xpath('following-sibling::ul[1]/li'):
51+ def_abbr = extract_text(def_item.xpath('.//abbr')).strip()
52+ def_text = extract_text(def_item).strip()
53+ if def_abbr:
54+ def_text = def_text[len(def_abbr):].strip()
55+ src_defs.append((def_abbr, def_text))
56+
57+ definitions.append((src_text, src_defs))
58+
59+ if not definitions:
60+ return results
61+
62+ infobox = ''
63+ for src_text, src_defs in definitions:
64+ infobox += f"<small>{src_text}</small>"
65+ infobox += "<ul>"
66+ for def_abbr, def_text in src_defs:
67+ if def_abbr:
68+ def_abbr += ": "
69+ infobox += f"<li><i>{def_abbr}</i> {def_text}</li>"
70+ infobox += "</ul>"
71+
72+ results.append({
73+ 'infobox': word,
74+ 'content': infobox,
75+ })
76+
77+ return results
searx/settings.yml+8
@@ -1271,6 +1271,14 @@ engines:
12711271 categories: videos
12721272 disabled : True
12731273
1274+ - name: wordnik
1275+ engine: wordnik
1276+ shortcut: def
1277+ base_url: https://www.wordnik.com/
1278+ categories: general
1279+ timeout: 5.0
1280+ disabled: True
1281+
12741282 - name: słownik języka polskiego
12751283 engine: sjp
12761284 shortcut: sjp
searx/webapp.py+4−1
@@ -1133,11 +1133,14 @@ class ReverseProxyPathFix:
11331133
11341134 base_url = urlparse(settings['server']['base_url'])
11351135 self.script_name = base_url.path
1136+ if self.script_name.endswith('/'):
1137+ # remove trailing slash to avoid infinite redirect on the index
1138+ # see https://github.com/searx/searx/issues/2729
1139+ self.script_name = self.script_name[:-1]
11361140 self.scheme = base_url.scheme
11371141 self.server = base_url.netloc
11381142
11391143 def __call__(self, environ, start_response):
1140−
11411144 script_name = self.script_name or environ.get('HTTP_X_SCRIPT_NAME', '')
11421145 if script_name:
11431146 environ['SCRIPT_NAME'] = script_name