[enh] oa_doi_rewrite plugin broadens doai_rewrite

searx/plugins/__init__.py

@@ -22,7 +22,7 @@ if version_info[0] == 3:
 
 logger = logger.getChild('plugins')
 
-from searx.plugins import (doai_rewrite,
+from searx.plugins import (oa_doi_rewrite,
                            https_rewrite,
                            infinite_scroll,
                            open_results_on_new_tab,
@@ -78,7 +78,7 @@ class PluginStore():
 
 
 plugins = PluginStore()
-plugins.register(doai_rewrite)
+plugins.register(oa_doi_rewrite)
 plugins.register(https_rewrite)
 plugins.register(infinite_scroll)
 plugins.register(open_results_on_new_tab)

searx/plugins/oa_doi_rewrite.py

@@ -1,14 +1,19 @@
 from flask_babel import gettext
 import re
 from searx.url_utils import urlparse, parse_qsl
+from flask import request
+from searx import settings
+
 
 regex = re.compile(r'10\.\d{4,9}/[^\s]+')
 
-name = gettext('DOAI rewrite')
+name = gettext('Open Access DOI rewrite')
 description = gettext('Avoid paywalls by redirecting to open-access versions of publications when available')
 default_on = False
 preference_section = 'privacy'
 
+doi_resolvers = settings['doi_resolvers']
+
 
 def extract_doi(url):
     match = regex.search(url.path)
@@ -21,12 +26,20 @@ def extract_doi(url):
     return None
 
 
+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_resolvers[doi_resolver]
+
+
 def on_result(request, search, result):
     doi = extract_doi(result['parsed_url'])
     if doi and len(doi) < 50:
         for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'):
             if doi.endswith(suffix):
                 doi = doi[:-len(suffix)]
-        result['url'] = 'http://doai.io/' + doi
+        result['url'] = get_doi_resolver() + doi
         result['parsed_url'] = urlparse(result['url'])
     return True