diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 4b21096c2f..41718a9e3b 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -194,11 +194,6 @@ class CuraPackageManager(QObject): return package_id = package_info["package_id"] - # # Check the delayed installation and removal lists first - # if package_id in self._to_remove_package_set: - # self._to_remove_package_set.remove(package_id) - # has_changes = True - # Check if it is installed installed_package_info = self.getInstalledPackageInfo(package_info["package_id"]) to_install_package = installed_package_info is None # Install if the package has not been installed diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml index d63326288d..07f4ed632c 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml @@ -37,10 +37,7 @@ Column font: UM.Theme.getFont("default_bold") } } - onClicked: { - // Must do all stuff in 1 function as the current ToolboxInstalledTile object is going to disappear... - toolbox.update(model.id) - } + onClicked: toolbox.update(model.id) } ProgressBar { diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 3dd1ec90ec..81046b51ce 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -228,9 +228,15 @@ class Toolbox(QObject, Extension): def _update(self) -> None: if self._to_update: plugin_id = self._to_update.pop(0) - Logger.log("d", "Updating package [%s]..." % plugin_id) - self.uninstall(plugin_id) - self.startDownload(self.getRemotePackageURL(plugin_id)) + remote_package = self.getRemotePackage(plugin_id) + if remote_package: + download_url = remote_package["download_url"] + Logger.log("d", "Updating package [%s]..." % plugin_id) + self.uninstall(plugin_id) + self.startDownload(download_url) + else: + Logger.log("e", "Could not update package [%s] because there is no remote package info available.", plugin_id) + if self._to_update: self._application.callLater(self._update) @@ -277,14 +283,6 @@ class Toolbox(QObject, Extension): break return remote_package - @pyqtSlot(str, result = str) - def getRemotePackageURL(self, package_id: str) -> str: - remote_package = self.getRemotePackage(package_id) - if remote_package: - return remote_package["download_url"] - else: - return "" - # Checks # -------------------------------------------------------------------------- @pyqtSlot(str, result = bool)