fix metadata + load dev after zip

Author: 3nids

oqtopus/core/module_package.py

@@ -39,6 +39,9 @@ def __init__(
         self.asset_project = None
         self.asset_plugin = None
 
+        self.source_package_zip = None
+        self.source_package_dir = None
+
         if self.type == ModulePackage.Type.RELEASE:
             self.__parse_release(json_payload)
         elif self.type == ModulePackage.Type.BRANCH:
@@ -56,9 +59,6 @@ def __init__(
 
         self.download_url = f"https://github.com/{self.organisation}/{self.repository}/archive/refs/{type}/{self.branch}.zip"
 
-        self.source_package_zip = None
-        self.source_package_dir = None
-
     def display_name(self):
         if self.prerelease:
             return f"{self.name} (prerelease)"

oqtopus/gui/module_selection_widget.py

@@ -250,13 +250,13 @@ def __loadModuleFromZip(self, filename):
     def __packagePrepareTaskFinished(self):
         logger.info("Load package task finished")
 
-        self.signal_loadingFinished.emit()
         self.module_progressBar.setVisible(False)
 
         if isinstance(self.__packagePrepareTask.lastError, PackagePrepareTaskCanceled):
             logger.info("Load package task was canceled by user.")
             self.module_information_label.setText(self.tr("Package loading canceled."))
             QtUtils.setForegroundColor(self.module_information_label, PluginUtils.COLOR_WARNING)
+            # Don't emit signal_loadingFinished when cancelled - a new load may be starting
             return
 
         if self.__packagePrepareTask.lastError is not None:
@@ -266,8 +266,11 @@ def __packagePrepareTaskFinished(self):
             ).exec()
             self.module_information_label.setText(error_text)
             QtUtils.setForegroundColor(self.module_information_label, PluginUtils.COLOR_WARNING)
+            self.signal_loadingFinished.emit()
             return
 
+        self.signal_loadingFinished.emit()
+
         package_dir = self.module_package_comboBox.currentData().source_package_dir
         logger.info(f"Package loaded into '{package_dir}'")
         QtUtils.resetForegroundColor(self.module_information_label)
@@ -418,9 +421,14 @@ def __loadDevelopmentVersionsFinished(self, error):
         logger.info("Loading development versions finished")
 
         QApplication.restoreOverrideCursor()
-        self.signal_loadingFinished.emit()
         self.module_progressBar.setVisible(False)
 
+        # Hide zip widget when loading development versions
+        self.module_zipPackage_groupBox.setVisible(False)
+
+        # Clear current module package - user needs to select a specific version
+        self.__current_module_package = None
+
         if error:
             if "rate limit exceeded for url" in error.lower():
                 QMessageBox.critical(

oqtopus/metadata.txt

@@ -20,5 +20,3 @@ icon=icons/oqtopus-logo.png
 experimental=True
 deprecated=False
 server=False
-
-supportsQt6=True