Rewrite unsupported plugins logic and hard-code plover version for now

Author: mkrnr

plover/plugins_manager/package_index.py

@@ -7,21 +7,16 @@
 
 PYPI_URL = 'https://pypi.org/pypi'
 REGISTRY_URL = 'https://github.com/openstenoproject/plover_plugins_registry/raw/master/registry.json'
-#TODO update with proper URL
-UNSUPPORTED_PLUGINS_URL = 'https://raw.githubusercontent.com/mkrnr/plover_plugins_registry/registry_plover_v5/unsupported.json'
 
 
-def find_plover_plugins_releases(pypi_url=None, registry_url=None, unsupported_plugins_url=None, capture=None):
+def find_plover_plugins_releases(pypi_url=None, registry_url=None, capture=None):
 
     if pypi_url is None:
         pypi_url = os.environ.get('PYPI_URL', PYPI_URL)
 
     if registry_url is None:
         registry_url = os.environ.get('REGISTRY_URL', REGISTRY_URL)
 
-    if unsupported_plugins_url is None:
-        unsupported_plugins_url = os.environ.get('UNSUPPORTED_PLUGINS_URL', UNSUPPORTED_PLUGINS_URL)
-
     session = CachedFuturesSession()
 
     in_progress = set()
@@ -42,8 +37,6 @@ def fetch_release(name, version=None):
         for name in session.get(registry_url).result().json():
             fetch_release(name)
 
-        unsupported_plugins_dict=session.get(unsupported_plugins_url).result().json()
-
         while in_progress:
             for future in as_completed(list(in_progress)):
                 in_progress.remove(future)
@@ -60,8 +53,6 @@ def fetch_release(name, version=None):
                     continue
                 name, version = info['name'], info['version']
                 all_releases[(name, version)] = release
-                if name in unsupported_plugins_dict:
-                    info['unsupported_plover_version'] = unsupported_plugins_dict[name]
 
     all_releases = [
         release

plover/plugins_manager/plugin_metadata.py

@@ -17,7 +17,6 @@ class PluginMetadata(namedtuple('PluginMetadata', '''
                                 name
                                 summary
                                 version
-                                unsupported_plover_version
                                 ''')):
 
     @property

plover/plugins_manager/registry.py

@@ -3,6 +3,8 @@
 
 from plover.plugins_manager import global_registry, local_registry
 
+from plover.plugins_manager.requests import CachedFuturesSession
+
 
 class PackageState:
 
@@ -46,6 +48,9 @@ def __lt__(self, other):
     def __repr__(self):
         return str(self)
 
+#TODO update with proper URL
+UNSUPPORTED_PLUGINS_URL = 'https://raw.githubusercontent.com/mkrnr/plover_plugins_registry/registry_plover_v5/unsupported.json'
+
 
 class Registry:
 
@@ -90,14 +95,23 @@ def parse_unsupported_plover_version(self, unsupported_plover_version)->int:
                 ) from e
         else:
             raise ValueError(
-                f'Unknown format for unsupported_plover_version "{unsupported_plover_version}" from plugin metadata'
+                f'Unknown format for unsupported plover version "{unsupported_plover_version}" from plugin metadata'
             )
 
 
-    def is_plugin_supported(self, unsupported_plover_version):
-        if unsupported_plover_version:
-            parsed_unsupported_plover_version = self.parse_unsupported_plover_version(unsupported_plover_version)
+    def is_plugin_supported(self,pkg, unsupported_plugins_dict):
+        if not unsupported_plugins_dict:
+            return True
+        if pkg.name in unsupported_plugins_dict:
+            unsupported_plover_version= unsupported_plugins_dict[pkg.name]
+            try:
+                parsed_unsupported_plover_version = self.parse_unsupported_plover_version(unsupported_plover_version)
+            except:
+                log.warning(f'Failed to parse unsupported plover version "{pkg.unsupported_plover_version}" for plugin {pkg.name}, assuming plugin is supported',exc_info=True)
+                return True
             current_major_plover_version = int(__version__.split('.')[0])
+            #TODO remove this overwrite after PR-1601 is merged and 5.0.0-alpha.1 released
+            current_major_plover_version = 5
             return current_major_plover_version < parsed_unsupported_plover_version
         else:
             return True
@@ -106,9 +120,17 @@ def update(self):
         try:
             available_plugins = global_registry.list_plugins()
         except:
-            log.error("failed to fetch list of available plugins from PyPI",
+            log.error("Failed to fetch list of available plugins from PyPI",
                       exc_info=True)
             return
+
+        session = CachedFuturesSession()
+        try:
+            unsupported_plugins_dict=session.get(UNSUPPORTED_PLUGINS_URL).result().json()
+        except:
+            log.warning("Failed to fetch list of unsupported plugins, assuming all plugins are supported",
+                      exc_info=True)
+
         for name, metadata in available_plugins.items():
             pkg = self._packages.get(name)
             if pkg is None:
@@ -118,10 +140,5 @@ def update(self):
                 pkg.available = metadata
                 if pkg.current and pkg.current.parsed_version < pkg.latest.parsed_version:
                     pkg.status = 'outdated'
-            try:
-                is_plugin_supported = self.is_plugin_supported(pkg.unsupported_plover_version)
-            except:
-                log.warning(f'Failed to parse unsupported plover version "{pkg.unsupported_plover_version}" for plugin {pkg.name}, assuming plugin is supported',exc_info=True)
-                is_plugin_supported = True
-            if not is_plugin_supported:
+            if not self.is_plugin_supported(pkg, unsupported_plugins_dict):
                 pkg.status = 'unsupported'