Message box

Author: domi4484

oqtopus/core/package_prepare_task.py

@@ -90,15 +90,16 @@ def __download_module_version(self, module_version):
         logging.info(f"Downloading from '{url}' to '{self.zip_file}'")
         data_size = 0
         with open(self.zip_file, "wb") as file:
+            next_emit_threshold = 5 * 1024 * 1024  # 5MB threshold
             for data in response.iter_content(chunk_size=None):
+                file.write(data)
 
                 self.__checkForCanceled()
 
                 data_size += len(data)
-                # print(f"Recived '{data_size}' bytes")
-                # self.signalPackagingProgress.emit(data_size)
-
-                file.write(data)
+                if data_size >= next_emit_threshold:  # Emit signal when threshold is exceeded
+                    self.signalPackagingProgress.emit(data_size)
+                    next_emit_threshold += 5 * 1024 * 1024  # Update to the next threshold
 
     def __extract_zip_file(self, zip_file):
         temp_dir = PluginUtils.plugin_temp_path()

oqtopus/gui/main_dialog.py

@@ -53,7 +53,7 @@ class MainDialog(QDialog, DIALOG_UI):
     def __init__(self, modules_registry, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
-        self.buttonBox.rejected.connect(self.accept)
+        self.buttonBox.rejected.connect(self.__closeDialog)
         self.buttonBox.helpRequested.connect(self.__helpRequested)
 
         self.__modules_registry = modules_registry
@@ -79,9 +79,6 @@ def __init__(self, modules_registry, parent=None):
             self.__packagePrepareTaskProgress
         )
 
-    def __helpRequested(self):
-        QDesktopServices.openUrl(QUrl("https://github.com/oqtopus/Oqtopus"))
-
     def __initGuiModules(self):
         self.module_module_comboBox.clear()
         self.module_module_comboBox.addItem(self.tr("Please select a module"), None)
@@ -134,6 +131,16 @@ def __initGuiModuleInfo(self):
         self.moduleInfo_install_pushButton.clicked.connect(self.__installModuleClicked)
         self.moduleInfo_upgrade_pushButton.clicked.connect(self.__upgradeModuleClicked)
 
+    def __closeDialog(self):
+        if self.__packagePrepareTask.isRunning():
+            self.__packagePrepareTask.cancel()
+            self.__packagePrepareTask.wait()
+
+        self.accept()
+
+    def __helpRequested(self):
+        QDesktopServices.openUrl(QUrl("https://github.com/oqtopus/Oqtopus"))
+
     def __loadDatabaseInformations(self):
         self.db_servicesConfigFilePath_label.setText(pgserviceparser.conf_path().as_posix())
 
@@ -278,11 +285,14 @@ def __packagePrepareTaskFinished(self):
         self.__data_model_dir = os.path.join(self.__packagePrepareTask.package_dir, "datamodel")
         pumConfigFilename = os.path.join(self.__data_model_dir, ".pum.yaml")
         if not os.path.exists(pumConfigFilename):
-            raise Exception(
+            QMessageBox.critical(
+                self,
+                self.tr("Error"),
                 self.tr(
                     f"The selected file '{self.__packagePrepareTask.zip_file}' does not contain a valid .pum.yaml file."
-                )
+                ),
             )
+            return
 
         self.__pum_config = PumConfig.from_yaml(pumConfigFilename)