fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-01-01 22:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1131 from phw/PICARD-1491-fix-plugin-list-version-check

Browse Source 
PICARD-1491: Fix plugin version check when loading plugin list
This commit is contained in:
Laurent Monin
2019-03-12 19:16:29 +01:00
committed by GitHub
parent 95f60e5d94 0cdbfdd586
commit b6dd3dfecd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
picard/plugin.py
View File

@@ -336,9 +336,7 @@ class PluginManager(QtCore.QObject):
plugin_module = importer.load_module(_PLUGIN_MODULE_PREFIX + name)
plugin = PluginWrapper(plugin_module, plugindir,
file=module_pathname, manifest_data=manifest_data)
versions = [version_from_string(v) for v in
list(plugin.api_versions)]
compatible_versions = list(set(versions) & self._api_versions)
compatible_versions = self._compatible_api_versions(plugin.api_versions)
if compatible_versions:
log.debug("Loading plugin %r version %s, compatible with API: %s",
plugin.name,
@@ -365,6 +363,10 @@ class PluginManager(QtCore.QObject):
module_file.close()
return plugin
def _compatible_api_versions(self, api_versions):
versions = [version_from_string(v) for v in list(api_versions)]
return set(versions) & self._api_versions
def _get_existing_paths(self, plugin_name):
dirpath = os.path.join(USER_PLUGIN_DIR, plugin_name)
if not os.path.isdir(dirpath):
@@ -495,11 +497,10 @@ class PluginManager(QtCore.QObject):
)
self._available_plugins = []
else:
supported_versions = set(api_versions)
try:
self._available_plugins = [PluginData(data, key) for key, data in
response['plugins'].items()
if supported_versions.intersection(data['api_versions'])]
if self._compatible_api_versions(data['api_versions'])]
except (AttributeError, KeyError, TypeError):
self._available_plugins = []
if callback: