Plugins: a selectable plugin cannot be needed by another plugin (#2247).

opencor · Dec 3, 2019 · 090abdc · 090abdc
1 parent d97d363
commit 090abdc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/i18n/OpenCOR_fr.ts b/i18n/OpenCOR_fr.ts
@@ -253,6 +253,10 @@
         <source>the plugin claims to be the core plugin, but it does not support the core interface.</source>
         <translation>l&apos;extension prétend être l&apos;extension de base, mais elle ne supporte pas l&apos;interface de base.</translation>
     </message>
+    <message>
+        <source>the plugin claims to be selectable, but it is needed.</source>
+        <translation>l&apos;extension prétend être sélectionnable, mais elle est nécessaire.</translation>
+    </message>
     <message>
         <source>the plugin supports the CLI interface, but it does not claim to be CLI-capable.</source>
         <translation>l&apos;extension supporte l&apos;interface CLI, mais elle ne prétend pas être capable de CLI.</translation>

diff --git a/src/misc/cliapplication.cpp b/src/misc/cliapplication.cpp
@@ -445,6 +445,10 @@ void CliApplication::status() const
         case Plugin::Status::InvalidCorePlugin:
             pluginInfo += "the plugin claims to be the core plugin, but it does not support the core interface.";
 
+            break;
+        case Plugin::Status::NeededSelectablePlugin:
+            pluginInfo += "the plugin claims to be selectable, but it is needed.";
+
             break;
         case Plugin::Status::NotCliPluginNoCliSupport:
             pluginInfo += "the plugin supports the CLI interface, but it does not claim to be CLI-capable.";

diff --git a/src/plugins/plugin.cpp b/src/plugins/plugin.cpp
@@ -59,17 +59,19 @@ namespace OpenCOR {
 //==============================================================================
 
 Plugin::Plugin(const QString &pFileName, PluginInfo *pInfo,
-               const QString &pErrorMessage, bool pLoad,
+               const QString &pErrorMessage, bool pLoad, bool pNeeded,
                PluginManager *pPluginManager) :
     mName(name(pFileName)),
     mInfo(pInfo),
     mErrorMessage(pErrorMessage)
 {
     if (pInfo != nullptr) {
-        // We are dealing with a plugin, so try to load it, but only if the user
-        // wants
+        // We are dealing with a plugin, so try to load it (if needed), but
+        // before that make sure that it is not both needed and selectable
 
-        if (pLoad) {
+        if (pNeeded && pInfo->isSelectable()) {
+            mStatus = Status::NeededSelectablePlugin;
+        } else if (pLoad) {
             // Make sure that the plugin's dependencies, if any, are loaded
             // before loading the plugin itself
             // Note: normally, we would only do this on Windows systems since,

diff --git a/src/plugins/plugin.h b/src/plugins/plugin.h
@@ -75,13 +75,14 @@ class Plugin : public QObject
         OldPlugin,
         NotCorePlugin,
         InvalidCorePlugin,
+        NeededSelectablePlugin,
         NotCliPluginNoCliSupport,
         NotCliPluginNoCliInterface,
         MissingOrInvalidDependencies
     };
 
     explicit Plugin(const QString &pFileName, PluginInfo *pInfo,
-                    const QString &pErrorMessage, bool pLoad,
+                    const QString &pErrorMessage, bool pLoad, bool pNeeded,
                     PluginManager *pPluginManager);
     ~Plugin() override;
 

diff --git a/src/plugins/pluginmanager.cpp b/src/plugins/pluginmanager.cpp
@@ -171,7 +171,8 @@ PluginManager::PluginManager(bool pGuiMode) :
         auto plugin = new Plugin(pluginFileName,
                                  pluginsInfo.value(pluginName),
                                  pluginsError.value(pluginName),
-                                 plugins.contains(pluginName), this);
+                                 plugins.contains(pluginName),
+                                 neededPlugins.contains(pluginName), this);
 
         // Keep track of the plugin and of the Core plugin, in particular, if it
         // is loaded

diff --git a/src/pluginsdialog.cpp b/src/pluginsdialog.cpp
@@ -285,6 +285,8 @@ QString PluginsDialog::statusDescription(Plugin *pPlugin) const
         return tr("the plugin claims to be the core plugin, but it is not.");
     case Plugin::Status::InvalidCorePlugin:
         return tr("the plugin claims to be the core plugin, but it does not support the core interface.");
+    case Plugin::Status::NeededSelectablePlugin:
+        return tr("the plugin claims to be selectable, but it is needed.");
     case Plugin::Status::NotCliPluginNoCliSupport:
         return tr("the plugin supports the CLI interface, but it does not claim to be CLI-capable.");
     case Plugin::Status::NotCliPluginNoCliInterface: