summaryrefslogtreecommitdiff
path: root/searx/engines
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2022-05-07 18:23:10 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2022-05-07 18:23:10 +0200
commit4326009d003f0c5cda518deeff0030903fbc7605 (patch)
tree98123244a625e5ff30232c4c83d06047bd856030 /searx/engines
parent9ed6261308da1fafb0bda4c5bd5cf73c7b4c3444 (diff)
downloadsearxng-4326009d003f0c5cda518deeff0030903fbc7605.tar.gz
searxng-4326009d003f0c5cda518deeff0030903fbc7605.zip
[format.python] based on bugfix in 9ed626130
Diffstat (limited to 'searx/engines')
-rw-r--r--searx/engines/dailymotion.py11
-rw-r--r--searx/engines/jisho.py31
2 files changed, 20 insertions, 22 deletions
diff --git a/searx/engines/dailymotion.py b/searx/engines/dailymotion.py
index f19bd934b..7dd84dd27 100644
--- a/searx/engines/dailymotion.py
+++ b/searx/engines/dailymotion.py
@@ -30,7 +30,7 @@ number_of_results = 10
time_range_support = True
time_delta_dict = {
- "day": timedelta(days=1),
+ "day": timedelta(days=1),
"week": timedelta(days=7),
"month": timedelta(days=31),
"year": timedelta(days=365),
@@ -58,7 +58,7 @@ search_url = (
'fields={fields}&password_protected={password_protected}&private={private}&sort={sort}&limit={limit}'
).format(
fields=','.join(result_fields),
- password_protected= 'false',
+ password_protected='false',
private='false',
sort='relevance',
limit=number_of_results,
@@ -93,7 +93,7 @@ def request(query, params):
query_args = {
'search': query,
'languages': language_iso639,
- 'page': params['pageno'],
+ 'page': params['pageno'],
}
if locale.territory:
@@ -170,7 +170,4 @@ def response(resp):
# get supported languages from their site
def _fetch_supported_languages(resp):
response_json = resp.json()
- return [
- item['locale']
- for item in response_json['list']
- ]
+ return [item['locale'] for item in response_json['list']]
diff --git a/searx/engines/jisho.py b/searx/engines/jisho.py
index 87bbe983d..7f4392bc1 100644
--- a/searx/engines/jisho.py
+++ b/searx/engines/jisho.py
@@ -53,19 +53,16 @@ def response(resp):
if 'reading' in title_raw:
title += ' (' + title_raw['reading'] + ')'
alt_forms.append(title)
-
- #
+
result_url = urljoin(BASE_URL, page['slug'])
definitions = get_definitions(page)
# For results, we'll return the URL, all alternative forms (as title),
# and all definitions (as description) truncated to 300 characters.
content = " ".join(f"{engdef}." for _, engdef, _ in definitions)
- results.append({
- 'url': result_url,
- 'title': ", ".join(alt_forms),
- 'content': content[:300] + (content[300:] and '...')
- })
+ results.append(
+ {'url': result_url, 'title': ", ".join(alt_forms), 'content': content[:300] + (content[300:] and '...')}
+ )
# Like Wordnik, we'll return the first result in an infobox too.
if first_result:
@@ -93,11 +90,13 @@ def get_definitions(page):
extra.append(', '.join(defn_raw['info']).capitalize() + '. ')
if defn_raw.get('restrictions'):
extra.append('Only applies to: ' + ', '.join(defn_raw['restrictions']) + '. ')
- definitions.append((
- ', '.join(defn_raw['parts_of_speech']),
- '; '.join(defn_raw['english_definitions']),
- ''.join(extra)[:-1],
- ))
+ definitions.append(
+ (
+ ', '.join(defn_raw['parts_of_speech']),
+ '; '.join(defn_raw['english_definitions']),
+ ''.join(extra)[:-1],
+ )
+ )
return definitions
@@ -109,12 +108,14 @@ def get_infobox(alt_forms, result_url, definitions):
infobox_content.append(f'<p><i>Other forms:</i> {", ".join(alt_forms[1:])}</p>')
# definitions
- infobox_content.append('''
+ infobox_content.append(
+ '''
<small><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project">JMdict</a>
and <a href="https://www.edrdg.org/enamdict/enamdict_doc.html">JMnedict</a>
by <a href="https://www.edrdg.org/edrdg/licence.html">EDRDG</a>, CC BY-SA 3.0.</small>
<ul>
- ''')
+ '''
+ )
for pos, engdef, extra in definitions:
if pos == 'Wikipedia definition':
infobox_content.append('</ul><small>Wikipedia, CC BY-SA 3.0.</small><ul>')
@@ -132,5 +133,5 @@ def get_infobox(alt_forms, result_url, definitions):
'title': 'Jisho.org',
'url': result_url,
}
- ]
+ ],
}