oqtopus 0.1.21__tar.gz → 0.1.23__tar.gz

{oqtopus-0.1.21 → oqtopus-0.1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.21
+Version: 0.1.23
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -347,7 +347,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pgserviceparser<3.0.0,>=2.4.0
-Requires-Dist: pum<2.0.0,>=1.1.13
+Requires-Dist: pum<2.0.0,>=1.1.14
 Requires-Dist: PyYAML
 Requires-Dist: pydantic>=2.0
 Requires-Dist: psycopg<4.0.0,>=3.1.0

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus/core/package_prepare_task.py

@@ -24,21 +24,23 @@ class PackagePrepareTask(QThread):
         super().__init__(parent)
 
         self.module_package = None
+        self.from_zip_file = None
 
         self.__destination_directory = None
 
         self.__canceled = False
         self.lastError = None
 
-    def startFromZip(self, zip_file: str):
-
-        self.module_package = None
+    def startFromZip(self, module_package, zip_file: str):
+        self.module_package = module_package
+        self.from_zip_file = zip_file
 
         self.__canceled = False
         self.start()
 
     def startFromModulePackage(self, module_package):
         self.module_package = module_package
+        self.from_zip_file = None
 
         self.__canceled = False
         self.start()
@@ -55,9 +57,10 @@ class PackagePrepareTask(QThread):
             if self.module_package is None:
                 raise Exception(self.tr("No module version provided."))
 
-            self.__destination_directory = self.__prepareDestinationDirectory()
+            self.__destination_directory = self.__prepare_destination_directory()
+            logger.info(f"Destination directory: {self.__destination_directory}")
 
-            self.__download_module_assets(self.module_package)
+            self.__prepare_module_assets(self.module_package)
             self.lastError = None
 
         except Exception as e:
@@ -65,7 +68,7 @@ class PackagePrepareTask(QThread):
             logger.critical(f"Package prepare task error: {e}")
             self.lastError = e
 
-    def __prepareDestinationDirectory(self):
+    def __prepare_destination_directory(self):
         """
         Prepare the destination directory for the module package.
         This method creates a temporary directory for the package.
@@ -81,10 +84,13 @@ class PackagePrepareTask(QThread):
 
         return destination_directory
 
-    def __download_module_assets(self, module_package):
+    def __prepare_module_assets(self, module_package):
+
+        # Download the source or use from zip
+        zip_file = self.from_zip_file or self.__download_module_asset(
+            module_package.download_url, "source.zip"
+        )
 
-        # Download the source
-        zip_file = self.__download_module_asset(module_package.download_url, "source.zip")
         module_package.source_package_zip = zip_file
         package_dir = self.__extract_zip_file(zip_file)
         module_package.source_package_dir = package_dir

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus/gui/main_dialog.py

@@ -53,10 +53,12 @@ DIALOG_UI = PluginUtils.get_ui_class("main_dialog.ui")
 
 class MainDialog(QDialog, DIALOG_UI):
 
-    def __init__(self, modules_config_path, parent=None):
+    def __init__(self, modules_config_path, about_dialog_cls=None, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
+        self.__about_dialog_cls = about_dialog_cls or AboutDialog
+
         self.buttonBox.rejected.connect(self.__closeDialog)
         self.buttonBox.helpRequested.connect(self.__helpRequested)
 
@@ -94,14 +96,24 @@ class MainDialog(QDialog, DIALOG_UI):
         # Settings action
         settings_action = QAction(self.tr("Settings"), self)
         settings_action.triggered.connect(self.__open_settings_dialog)
+        self.menubar.addAction(settings_action)
+
+        # Help menu
+        help_menu = self.menubar.addMenu(self.tr("Help"))
+
+        # Documentation action
+        documentation_action = QAction(
+            PluginUtils.get_plugin_icon("help.svg"), self.tr("Documentation"), self
+        )
+        documentation_action.triggered.connect(PluginUtils.open_documentation)
+        help_menu.addAction(documentation_action)
 
         # About action
-        about_action = QAction(self.tr("About"), self)
+        about_action = QAction(
+            PluginUtils.get_plugin_icon("oqtopus-logo.png"), self.tr("About"), self
+        )
         about_action.triggered.connect(self.__show_about_dialog)
-
-        # Add actions to menubar
-        self.menubar.addAction(settings_action)
-        self.menubar.addAction(about_action)
+        help_menu.addAction(about_action)
 
         self.__moduleSelectionWidget.signal_loadingStarted.connect(
             self.__moduleSelection_loadingStarted
@@ -136,7 +148,7 @@ class MainDialog(QDialog, DIALOG_UI):
         dlg.exec()
 
     def __show_about_dialog(self):
-        dialog = AboutDialog(self)
+        dialog = self.__about_dialog_cls(self)
         dialog.exec()
 
     def __moduleSelection_loadingStarted(self):

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus/gui/module_selection_widget.py

@@ -129,7 +129,7 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
             return
 
         if self.__current_module_package.type == self.__current_module_package.Type.FROM_ZIP:
-            self.module_zippackage_groupBox.setVisible(True)
+            self.module_zipPackage_groupBox.setVisible(True)
             return
         else:
             self.module_zipPackage_groupBox.setVisible(False)
@@ -182,7 +182,7 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
             self.__packagePrepareTask.cancel()
             self.__packagePrepareTask.wait()
 
-        self.__packagePrepareTask.startFromZip(filename)
+        self.__packagePrepareTask.startFromZip(self.__current_module_package, filename)
 
         self.signal_loadingStarted.emit()
         self.module_progressBar.setVisible(True)
@@ -316,6 +316,7 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
                 repository=self.__current_module.repository,
                 json_payload=None,
                 type=ModulePackage.Type.FROM_ZIP,
+                name="from_zip",
             ),
         )
 

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus/gui/module_widget.py

@@ -49,7 +49,7 @@ class ModuleWidget(QWidget, DIALOG_UI):
             CriticalMessageBox(
                 self.tr("Error"),
                 self.tr(
-                    f"The selected file '{self.__current_module_package.source_package_zip}' does not contain a valid package directory."
+                    f"The selected file '{self.__current_module_package.source_package_zip}' doesn't contain a valid package directory."
                 ),
                 None,
                 self,
@@ -62,7 +62,7 @@ class ModuleWidget(QWidget, DIALOG_UI):
             CriticalMessageBox(
                 self.tr("Error"),
                 self.tr(
-                    f"The selected file '{self.__current_module_package.source_package_zip}' does not contain a valid .pum.yaml file."
+                    f"The selected file '{self.__current_module_package.source_package_zip}' doesn't contain a valid .pum.yaml file."
                 ),
                 None,
                 self,
@@ -140,6 +140,7 @@ class ModuleWidget(QWidget, DIALOG_UI):
                     roles=self.db_parameters_CreateAndGrantRoles_checkBox.isChecked(),
                     grant=self.db_parameters_CreateAndGrantRoles_checkBox.isChecked(),
                     beta_testing=beta_testing,
+                    commit=False,
                 )
 
                 if self.db_demoData_checkBox.isChecked():
@@ -149,6 +150,9 @@ class ModuleWidget(QWidget, DIALOG_UI):
                         name=demo_data_name,
                         parameters=parameters,
                     )
+
+                self.__database_connection.commit()
+
         except Exception as exception:
             CriticalMessageBox(
                 self.tr("Error"), self.tr("Can't install the module:"), exception, self

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus/oqtopus_plugin.py

@@ -123,6 +123,7 @@ class OqtopusPlugin:
             text=self.tr("Show &main dialog"),
             callback=self.show_main_dialog,
             parent=self.iface.mainWindow(),
+            add_to_toolbar=True,
         )
         self.add_action(
             icon_path=None,
@@ -131,6 +132,13 @@ class OqtopusPlugin:
             parent=self.iface.mainWindow(),
             add_to_toolbar=False,
         )
+        self.add_action(
+            icon_path=PluginUtils.get_plugin_icon_path("help.svg"),
+            text=self.tr("Help"),
+            callback=PluginUtils.open_documentation,
+            parent=self.iface.mainWindow(),
+            add_to_toolbar=False,
+        )
         self.add_action(
             icon_path=PluginUtils.get_plugin_icon_path("oqtopus-logo.png"),
             text=self.tr("&About"),

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus/utils/plugin_utils.py

@@ -46,6 +46,8 @@ class PluginUtils:
     COLOR_GREEN = QColor(12, 167, 137)
     COLOR_WARNING = QColor(255, 165, 0)
 
+    DOCUMENTATION_URL = "https://opengisch.github.io/oqtopus/"
+
     @staticmethod
     def plugin_root_path():
         """
@@ -95,8 +97,11 @@ class PluginUtils:
         return ini_text.value("version")
 
     @staticmethod
-    def init_logger():
-        PluginUtils.logsDirectory = f"{PluginUtils.plugin_root_path()}/logs"
+    def init_logger(logs_directory=None):
+        if logs_directory is not None:
+            PluginUtils.logsDirectory = logs_directory
+        else:
+            PluginUtils.logsDirectory = f"{PluginUtils.plugin_root_path()}/logs"
 
         directory = QDir(PluginUtils.logsDirectory)
         if not directory.exists():
@@ -121,7 +126,6 @@ class PluginUtils:
 
     @staticmethod
     def open_logs_folder():
-        print(f"Opening logs folder {PluginUtils.logsDirectory}")
         QDesktopServices.openUrl(QUrl.fromLocalFile(PluginUtils.logsDirectory))
 
     @staticmethod
@@ -150,6 +154,10 @@ class PluginUtils:
             headers["Authorization"] = f"token {token}"
         return headers
 
+    @staticmethod
+    def open_documentation():
+        QDesktopServices.openUrl(QUrl(PluginUtils.DOCUMENTATION_URL))
+
 
 class LoggingBridge(logging.Handler, QObject):
 

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.21
+Version: 0.1.23
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -347,7 +347,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pgserviceparser<3.0.0,>=2.4.0
-Requires-Dist: pum<2.0.0,>=1.1.13
+Requires-Dist: pum<2.0.0,>=1.1.14
 Requires-Dist: PyYAML
 Requires-Dist: pydantic>=2.0
 Requires-Dist: psycopg<4.0.0,>=3.1.0

{oqtopus-0.1.21 → oqtopus-0.1.23}/oqtopus.egg-info/requires.txt

@@ -1,5 +1,5 @@
 pgserviceparser<3.0.0,>=2.4.0
-pum<2.0.0,>=1.1.13
+pum<2.0.0,>=1.1.14
 PyYAML
 pydantic>=2.0
 psycopg<4.0.0,>=3.1.0

{oqtopus-0.1.21 → oqtopus-0.1.23}/requirements.txt

@@ -1,5 +1,5 @@
 pgserviceparser>=2.4.0,<3.0.0
-pum>=1.1.13,<2.0.0
+pum>=1.1.14,<2.0.0
 PyYAML
 pydantic >=2.0
 psycopg>=3.1.0,<4.0.0