From 1b10abfc92afed36627c7052b89d2de5e7f537ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Wed, 1 Nov 2017 13:58:48 +0100 Subject: [PATCH] minor fixes of doi resolver Closes #1047 --- searx/plugins/oa_doi_rewrite.py | 9 ++++---- searx/preferences.py | 2 +- searx/templates/oscar/preferences.html | 29 +++++++++++--------------- searx/webapp.py | 11 ++-------- 4 files changed, 19 insertions(+), 32 deletions(-) diff --git a/searx/plugins/oa_doi_rewrite.py b/searx/plugins/oa_doi_rewrite.py index e952c86f5..b62ef0b1e 100644 --- a/searx/plugins/oa_doi_rewrite.py +++ b/searx/plugins/oa_doi_rewrite.py @@ -1,7 +1,6 @@ from flask_babel import gettext import re from searx.url_utils import urlparse, parse_qsl -from flask import request from searx import settings @@ -26,12 +25,12 @@ def extract_doi(url): return None -def get_doi_resolver(): +def get_doi_resolver(args, preference_doi_resolver): doi_resolvers = settings['doi_resolvers'] - doi_resolver = request.args.get('doi_resolver', request.preferences.get_value('doi_resolver'))[0] + doi_resolver = args.get('doi_resolver', preference_doi_resolver)[0] if doi_resolver not in doi_resolvers: doi_resolvers = settings['default_doi_resolver'] - return doi_resolvers[doi_resolver] + return doi_resolver def on_result(request, search, result): @@ -40,6 +39,6 @@ def on_result(request, search, result): for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'): if doi.endswith(suffix): doi = doi[:-len(suffix)] - result['url'] = get_doi_resolver() + doi + result['url'] = get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')) + doi result['parsed_url'] = urlparse(result['url']) return True diff --git a/searx/preferences.py b/searx/preferences.py index 00a3fd683..1a143db6b 100644 --- a/searx/preferences.py +++ b/searx/preferences.py @@ -15,7 +15,7 @@ LANGUAGE_CODES = [l[0] for l in languages] LANGUAGE_CODES.append('all') DISABLED = 0 ENABLED = 1 -DOI_RESOLVERS = [r for r in settings['doi_resolvers'].keys()] +DOI_RESOLVERS = list(settings['doi_resolvers']) class MissingArgumentException(Exception): diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index dcca3cba7..5f85a9af6 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -118,6 +118,18 @@ {{ preferences_item_footer(info, label, rtl) }} + + {% set label = _('Open Access DOI resolver') %} + {% set info = _('Redirect to open-access versions of publications when available (plugin required)') %} + {{ preferences_item_header(info, label, rtl) }} + + {{ preferences_item_footer(info, label, rtl) }} @@ -223,23 +235,6 @@ {% endfor %} -
-
-

{{ _('OA DOI rewrite') }}

-
-
-
{{ _('Avoid paywalls by redirecting to open-access versions of publications when available') }}
-
- -
-
-
diff --git a/searx/webapp.py b/searx/webapp.py index 9542b7814..f81747325 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -66,6 +66,7 @@ from searx.search import SearchWithPlugins, get_search_query_from_webapp from searx.query import RawTextQuery from searx.autocomplete import searx_bang, backends as autocomplete_backends from searx.plugins import plugins +from searx.plugins.oa_doi_rewrite import get_doi_resolver from searx.preferences import Preferences, ValidationException from searx.answerers import answerers from searx.url_utils import urlencode, urlparse, urljoin @@ -164,14 +165,6 @@ def get_locale(): return locale -def get_doi_resolver(): - doi_resolvers = settings['doi_resolvers'] - doi_resolver = request.args.get('doi_resolver', request.preferences.get_value('doi_resolver'))[0] - if doi_resolver not in doi_resolvers: - doi_resolvers = settings['default_doi_resolver'] - return doi_resolver - - # code-highlighter @app.template_filter('code_highlighter') def code_highlighter(codelines, language=None): @@ -704,7 +697,7 @@ def preferences(): themes=themes, plugins=plugins, doi_resolvers=settings['doi_resolvers'], - current_doi_resolver=get_doi_resolver(), + current_doi_resolver=get_doi_resolver(request.args, request.preferences.get_value('doi_resolver')), allowed_plugins=allowed_plugins, theme=get_current_theme_name(), preferences_url_params=request.preferences.get_as_url_params(),