From a19c306cf34d3f498f76e24765954db6760a2654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= <candice.bentejac@gmail.com>
Date: Wed, 4 Jun 2025 21:21:42 +0200
Subject: [PATCH] [core] plugins: Remove `register/unregisterPlugin` methods

Remove the methods and perform the registration/unregistration directly
within the functions that called them. This simplifies the code and
prevents ambiguity between the different functions.
---
 meshroom/core/plugins.py | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/meshroom/core/plugins.py b/meshroom/core/plugins.py
index c3540709..46a63397 100644
--- a/meshroom/core/plugins.py
+++ b/meshroom/core/plugins.py
@@ -333,7 +333,8 @@ class NodePluginManager(BaseObject):
         if not self.getPlugin(plugin.name):
             self._plugins[plugin.name] = plugin
             if registerNodePlugins:
-                self.registerPlugin(plugin.name)
+                for node in plugin.nodes:
+                    self.registerNode(plugin.nodes[node])
 
     def removePlugin(self, plugin: Plugin, unregisterNodePlugins: bool = True):
         """
@@ -348,7 +349,8 @@ class NodePluginManager(BaseObject):
         """
         if self.getPlugin(plugin.name):
             if unregisterNodePlugins:
-                self.unregisterPlugin(plugin.name)
+                for node in plugin.nodes.values():
+                    self.unregisterNode(node)
             del self._plugins[plugin.name]
 
     def getRegisteredNodePlugins(self) -> dict[str: NodePlugin]:
@@ -372,33 +374,6 @@ class NodePluginManager(BaseObject):
             return self._nodePlugins[name]
         return None
 
-    def registerPlugin(self, name: str):
-        """
-        Register all the NodePlugins contained in the Plugin loaded as "name".
-
-        Args:
-            name: the name of the Plugin whose NodePlugins will be registered.
-        """
-        plugin = self.getPlugin(name)
-        if plugin:
-            for node in plugin.nodes:
-                self.registerNode(plugin.nodes[node])
-        else:
-            logging.error(f"No loaded Plugin named {name}.")
-
-    def unregisterPlugin(self, name: str):
-        """
-        Unregister all the NodePlugins contained in the Plugin loaded as "name"
-        that are currently registered.
-
-        Args:
-            name: the name of the Plugin whose NodePlugins will be unregistered.
-        """
-        plugin = self.getPlugin(name)
-        if plugin:
-            for node in plugin.nodes.values():
-                self.unregisterNode(node)
-
     def registerNode(self, nodePlugin: NodePlugin):
         """
         Register a node plugin. A registered node plugin will become instantiable.