switch install_plugin to accept list of plugins to install, #45

SimplyPrint · Nov 8, 2022 · 3c70422 · 3c70422
1 parent cb52421
commit 3c70422
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/octoprint_simplyprint/websocket/simplyprint.py b/octoprint_simplyprint/websocket/simplyprint.py
@@ -599,16 +599,17 @@ def _on_start_finished(fut: asyncio.Future):
         elif demand == "plugin_install":
             def _on_install_finished(install_success: asyncio.Future):
                 if install_success.result():
-                    self._logger.info("Restarting OctoPrint after plugin install.")
+                    self._logger.info("Restarting OctoPrint after plugin install(s).")
                     self._loop.run_in_executor(
                         None, self.sys_manager.restart_octoprint
                     )
                 else:
                     self._logger.debug("Failed to install plugin")
-            install_success: asyncio.Future = self._loop.run_in_executor(  # type: ignore
-                None, self.sys_manager.install_plugin, args
-            )
-            install_success.add_done_callback(_on_install_finished)
+            if args.get("plugins", False):
+                install_success: asyncio.Future = self._loop.run_in_executor(  # type: ignore
+                    None, self.sys_manager.install_plugin, args["plugins"]
+                )
+                install_success.add_done_callback(_on_install_finished)
         elif demand == "plugin_uninstall":
             def _on_uninstall_finished(uninstall_success: asyncio.Future):
                 if uninstall_success.result():

diff --git a/octoprint_simplyprint/websocket/system.py b/octoprint_simplyprint/websocket/system.py
@@ -213,29 +213,33 @@ def update_simplyprint(self) -> None:
         if self.install_plugin(data):
             self.restart_octoprint()
 
-    def install_plugin(self, plugin_data: Dict[str, str]) -> bool:
-        name = plugin_data['name']
-        url = plugin_data["install_url"]
-        self.logger.info(
-            f"Installing OctoPrint Plugin '{name}' at "
-            f"request from SimplyPrint from {url}"
-        )
-        key = plugin_data.get("key")
-        if key is not None and key not in self.installed_plugins:
-            self.installed_plugins.append(key)
-            self.settings.set(["sp_installed_plugins"], self.installed_plugins)
-            self.settings.save()
-        args: List[str] = ["install", url, "--no-cache-dir"]
-        try:
-            code, stdout, stderr = self._call_pip(*args)
-        except Exception:
-            self.logger.exception(f"Failed to install plugin: {name}")
-            return False
-        if code != 0:
-            self.logger.error(
-                f"Failed to install plugin {name}, returned with {code}\n"
-                f"{stdout}\n{stderr}"
+    def install_plugin(self, plugins: List[Dict[str, str]]) -> bool:
+        install_error = False
+        for plugin_data in plugins:
+            name = plugin_data['name']
+            url = plugin_data["install_url"]
+            self.logger.info(
+                f"Installing OctoPrint Plugin '{name}' at "
+                f"request from SimplyPrint from {url}"
             )
+            key = plugin_data.get("key")
+            if key is not None and key not in self.installed_plugins:
+                self.installed_plugins.append(key)
+                self.settings.set(["sp_installed_plugins"], self.installed_plugins)
+                self.settings.save()
+            args: List[str] = ["install", url, "--no-cache-dir"]
+            try:
+                code, stdout, stderr = self._call_pip(*args)
+            except Exception:
+                self.logger.exception(f"Failed to install plugin: {name}")
+                install_error = True
+            if code != 0:
+                self.logger.error(
+                    f"Failed to install plugin {name}, returned with {code}\n"
+                    f"{stdout}\n{stderr}"
+                )
+                install_error = True
+        if install_error:
             return False
         return True
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
 # Remember to bump the version in octoprint_simplyprint/__init__.py as well
-plugin_version = "4.0.2dev1"
+plugin_version = "4.0.2dev2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module