removal(dev): resource controller;

- Do not use resource controller interface.

Author: JVickery-TBS

ckanext/language_domains/helpers.py

@@ -18,9 +18,10 @@
 
 def _get_domain_index(current_domain: str, language_domains: Dict[str, str]) -> int:
     for _lang_code, lang_domains in language_domains.items():
-        for index, domain in enumerate(lang_domains):
-            if current_domain == domain:
-                return index
+        try:
+            return lang_domains.index(current_domain)
+        except ValueError:
+            return 0
     return 0
 
 
@@ -152,8 +153,8 @@ def local_url(url_to_amend: str, **kw: Any):
         root_paths = json.loads(root_paths)
     root_path = root_paths.get(host, '').rstrip('/')
     if root_path:
-        # FIXME this can be written better once the merge
-        # into the ecportal core is done - Toby
+        # FIXME this can be written better once
+        # the merge into the portal core is done
         # we have a special root specified so use that
         if default_locale:
             root_path = re.sub('/{{LANG}}', '', root_path)

ckanext/language_domains/plugin.py

@@ -23,7 +23,6 @@ class LanguageDomainsPlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.IConfigurer)
     plugins.implements(plugins.ITemplateHelpers)
     plugins.implements(plugins.IBlueprint)
-    plugins.implements(plugins.IResourceController, inherit=True)
 
     # IMiddleware
     def make_middleware(self, app: CKANApp, config: 'CKANConfig') -> CKANApp:
@@ -50,51 +49,6 @@ def get_helpers(self) -> Dict[str, Callable[..., Any]]:
     def get_blueprint(self) -> List[Blueprint]:
         return [language_domain_views]
 
-    # IResourceController
-    def before_resource_show(self, resource_dict: Dict[str, Any]) -> Dict[str, Any]:
-        # FIXME: is there a better way to store res_url in SOLR to prevent this
-        #        for everytime a Resource is shown???
-        language_domains = plugins.toolkit.config.get(
-            'ckanext.language_domains.domain_map', '')
-        if not language_domains:
-            language_domains = {}
-        else:
-            language_domains = json.loads(language_domains)
-
-        try:
-            current_language = plugins.toolkit.h.lang()
-            current_domain = plugins.toolkit.request.url
-            uri_parts = urlsplit(current_domain)
-            current_domain = uri_parts.netloc
-            _scheme, _host = helpers._get_correct_language_domain()
-        except RuntimeError:
-            current_language = 'en'
-            default_domain = plugins.toolkit.config.get('ckan.site_url', '')
-            uri_parts = urlsplit(default_domain)
-            current_domain = _host = uri_parts.netloc
-            _scheme = uri_parts.scheme
-
-        domain_index_match = helpers._get_domain_index(
-            current_domain, language_domains)
-
-        for lang_code, lang_domains in language_domains.items():
-            if (
-              resource_dict.get('url', '').startswith(
-                  f'{_scheme}://{lang_domains[domain_index_match]}') and
-              _host != lang_domains[domain_index_match]
-            ):
-                uri_parts = urlsplit(resource_dict['url'])
-                path = str(uri_parts.path)
-                if path.startswith(f'/{lang_code}/'):
-                    path = path[len(f'/{lang_code}'):]
-                elif path.startswith(f'/{current_language}/'):
-                    path = path[len(f'/{current_language}'):]
-                resource_dict['url'] = uri_parts._replace(
-                    netloc=_host, path=path).geturl()
-                break
-
-        return resource_dict
-
 
 class LanguageDomainMiddleware(object):
     def __init__(self, app: Any, config: 'CKANConfig'):