oqtopus 0.1.15__tar.gz → 0.1.17__tar.gz

{oqtopus-0.1.15 → oqtopus-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.15
+Version: 0.1.17
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE

{oqtopus-0.1.15 → oqtopus-0.1.17}/oqtopus/gui/database_create_dialog.py

@@ -35,6 +35,11 @@ from ..utils.qt_utils import OverrideCursor
 DIALOG_UI = PluginUtils.get_ui_class("database_create_dialog.ui")
 
 
+DEFAULT_PG_PORT = "5432"
+DEFAULT_PG_DB = "postgres"
+DEFAULT_PG_HOST = "localhost"
+
+
 class DatabaseCreateDialog(QDialog, DIALOG_UI):
     def __init__(self, selected_service=None, parent=None):
         QDialog.__init__(self, parent)
@@ -62,6 +67,11 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
         self.parameters_ssl_comboBox.addItem("require", "require")
         self.parameters_ssl_comboBox.addItem("verify-ca", "verify-ca")
         self.parameters_ssl_comboBox.addItem("verify-full", "verify-full")
+        self.parameters_ssl_comboBox.setCurrentIndex(2)  # Default to 'prefer'
+
+        self.parameters_host_lineEdit.setPlaceholderText(DEFAULT_PG_HOST)
+        self.parameters_port_lineEdit.setPlaceholderText(DEFAULT_PG_PORT)
+        self.parameters_database_lineEdit.setPlaceholderText(DEFAULT_PG_DB)
 
         self.database_lineEdit.textChanged.connect(self._databaseTextChanged)
 
@@ -91,8 +101,7 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
         self.parameters_ssl_comboBox.setCurrentIndex(parameter_ssl_index)
         self.parameters_user_lineEdit.setText(service_user)
         self.parameters_password_lineEdit.setText(service_password)
-
-        self.database_lineEdit.setText(service_dbname)
+        self.parameters_database_lineEdit.setText(service_dbname)
 
     def _enterManuallyToggled(self, checked):
         self.parameters_frame.setEnabled(checked)
@@ -195,16 +204,16 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
 
         # Collect parameters from manual input fields
         if self.parameters_host_lineEdit.text():
-            parameters["host"] = self.parameters_host_lineEdit.text()
+            parameters["host"] = self.parameters_host_lineEdit.text() or DEFAULT_PG_HOST
         if self.parameters_port_lineEdit.text():
-            parameters["port"] = self.parameters_port_lineEdit.text()
+            parameters["port"] = self.parameters_port_lineEdit.text() or DEFAULT_PG_PORT
         if self.parameters_ssl_comboBox.currentData():
             parameters["sslmode"] = self.parameters_ssl_comboBox.currentData()
         if self.parameters_user_lineEdit.text():
             parameters["user"] = self.parameters_user_lineEdit.text()
         if self.parameters_password_lineEdit.text():
             parameters["password"] = self.parameters_password_lineEdit.text()
-        if self.database_lineEdit.text():
-            parameters["dbname"] = self.database_lineEdit.text()
+        if self.parameters_database_lineEdit.text():
+            parameters["dbname"] = self.parameters_database_lineEdit.text() or DEFAULT_PG_DB
 
         return parameters

{oqtopus-0.1.15 → oqtopus-0.1.17}/oqtopus/gui/project_widget.py

@@ -1,11 +1,13 @@
 import os
 import shutil
 
+from qgis.PyQt.QtCore import QUrl
+from qgis.PyQt.QtGui import QDesktopServices
 from qgis.PyQt.QtWidgets import QFileDialog, QMessageBox, QWidget
 
 from ..core.module_package import ModulePackage
-from ..utils.plugin_utils import PluginUtils
-from ..utils.qt_utils import CriticalMessageBox, QtUtils
+from ..utils.plugin_utils import PluginUtils, logger
+from ..utils.qt_utils import QtUtils
 
 DIALOG_UI = PluginUtils.get_ui_class("project_widget.ui")
 
@@ -35,41 +37,40 @@ class ProjectWidget(QWidget, DIALOG_UI):
             QtUtils.setFontItalic(self.project_info_label, True)
             return
 
-        # Search for QGIS project file in self.__package_dir
-        project_file_dir = os.path.join(asset_project.package_dir, "project")
-
         # Check if the directory exists
-        if not os.path.exists(project_file_dir):
+        if not os.path.exists(asset_project.package_dir):
             self.project_info_label.setText(
-                self.tr(f"Project directory '{project_file_dir}' does not exist.")
+                self.tr(f"Project directory '{asset_project.package_dir}' does not exist.")
             )
             QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_WARNING)
             QtUtils.setFontItalic(self.project_info_label, True)
             return
 
-        self.__project_file = None
-        for root, dirs, files in os.walk(project_file_dir):
+        project_file = None
+        for root, dirs, files in os.walk(asset_project.package_dir):
             for file in files:
                 if file.endswith(".qgz") or file.endswith(".qgs"):
-                    self.__project_file = os.path.join(root, file)
+                    project_file = os.path.join(root, file)
                     break
 
-            if self.__project_file:
+            if project_file:
                 break
 
-        if self.__project_file is None:
+        if project_file is None:
             self.project_info_label.setText(
-                self.tr(f"No QGIS project file (.qgz or .qgs) found into {project_file_dir}."),
+                self.tr(
+                    f"No QGIS project file (.qgz or .qgs) found into {asset_project.package_dir}."
+                ),
             )
             QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_WARNING)
-            QtUtils.setFontItalic(self.db_database_label, True)
+            QtUtils.setFontItalic(self.project_info_label, True)
             return
 
+        QtUtils.resetForegroundColor(self.project_info_label)
+        QtUtils.setFontItalic(self.project_info_label, False)
         self.project_info_label.setText(
-            self.tr(self.__project_file),
+            f"<a href='file://{asset_project.package_dir}'>{asset_project.package_dir}</a>",
         )
-        QtUtils.setForegroundColor(self.project_info_label, PluginUtils.COLOR_GREEN)
-        QtUtils.setFontItalic(self.db_database_label, False)
 
     def __projectInstallClicked(self):
 
@@ -81,15 +82,7 @@ class ProjectWidget(QWidget, DIALOG_UI):
             )
             return
 
-        if self.module_package_comboBox.currentData() is None:
-            QMessageBox.warning(
-                self,
-                self.tr("Error"),
-                self.tr("Please select a module version first."),
-            )
-            return
-
-        asset_project = self.module_package_comboBox.currentData().asset_project
+        asset_project = self.__current_module_package.asset_project
         if asset_project is None:
             QMessageBox.warning(
                 self,
@@ -98,46 +91,6 @@ class ProjectWidget(QWidget, DIALOG_UI):
             )
             return
 
-        package_dir = asset_project.package_dir
-        if package_dir is None:
-            CriticalMessageBox(
-                self.tr("Error"), self.tr("No valid package directory available."), None, self
-            ).exec()
-            return
-
-        # Search for QGIS project file in package_dir
-        project_file_dir = os.path.join(package_dir, "project")
-
-        # Check if the directory exists
-        if not os.path.exists(project_file_dir):
-            CriticalMessageBox(
-                self.tr("Error"),
-                self.tr(f"Project directory '{project_file_dir}' does not exist."),
-                None,
-                self,
-            ).exec()
-            return
-
-        self.__project_file = None
-        for root, dirs, files in os.walk(project_file_dir):
-            print(f"Searching for QGIS project file in {root}: {files}")
-            for file in files:
-                if file.endswith(".qgz") or file.endswith(".qgs"):
-                    self.__project_file = os.path.join(root, file)
-                    break
-
-            if self.__project_file:
-                break
-
-        if self.__project_file is None:
-            CriticalMessageBox(
-                self.tr("Error"),
-                self.tr(f"No QGIS project file (.qgz or .qgs) found into {project_file_dir}."),
-                None,
-                self,
-            ).exec()
-            return
-
         install_destination = QFileDialog.getExistingDirectory(
             self,
             self.tr("Select installation directory"),
@@ -148,15 +101,22 @@ class ProjectWidget(QWidget, DIALOG_UI):
         if not install_destination:
             return
 
-        # Copy the project file to the selected directory
+        # Copy the project files to the selected directory
         try:
-            shutil.copy(self.__project_file, install_destination)
+            # Copy all files from assset_project to install_destination
+            for item in os.listdir(asset_project.package_dir):
+                source_path = os.path.join(asset_project.package_dir, item)
+                destination_path = os.path.join(install_destination, item)
+
+                if os.path.isdir(source_path):
+                    shutil.copytree(source_path, destination_path, dirs_exist_ok=True)
+                else:
+                    shutil.copy2(source_path, destination_path)
+
             QMessageBox.information(
                 self,
                 self.tr("Project installed"),
-                self.tr(
-                    f"Project file '{self.__project_file}' has been copied to '{install_destination}'."
-                ),
+                self.tr(f"Project files have been copied to '{install_destination}'."),
             )
         except Exception as e:
             QMessageBox.critical(
@@ -167,4 +127,32 @@ class ProjectWidget(QWidget, DIALOG_UI):
             return
 
     def __projectSeeChangelogClicked(self):
-        self.__seeChangeLogClicked()
+        if self.__current_module_package is None:
+            QMessageBox.warning(
+                self,
+                self.tr("Can't open changelog"),
+                self.tr("Please select a module and version first."),
+            )
+            return
+
+        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
+            QMessageBox.warning(
+                self,
+                self.tr("Can't open changelog"),
+                self.tr("Changelog is not available for Zip packages."),
+            )
+            return
+
+        if self.__current_module_package.html_url is None:
+            QMessageBox.warning(
+                self,
+                self.tr("Can't open changelog"),
+                self.tr(
+                    f"Changelog not available for version '{self.__current_module_package.display_name()}'."
+                ),
+            )
+            return
+
+        changelog_url = self.__current_module_package.html_url
+        logger.info(f"Opening changelog URL: {changelog_url}")
+        QDesktopServices.openUrl(QUrl(changelog_url))

{oqtopus-0.1.15 → oqtopus-0.1.17}/oqtopus/ui/database_create_dialog.ui

@@ -62,13 +62,23 @@
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QGridLayout" name="gridLayout_5">
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_10">
+         <item row="5" column="1">
+          <widget class="QLineEdit" name="parameters_password_lineEdit">
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="label_12">
            <property name="text">
-            <string>Port</string>
+            <string>Password</string>
            </property>
           </widget>
          </item>
+         <item row="3" column="1">
+          <widget class="QComboBox" name="parameters_ssl_comboBox"/>
+         </item>
          <item row="3" column="0">
           <widget class="QLabel" name="label_11">
            <property name="text">
@@ -76,38 +86,11 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
-          <widget class="QComboBox" name="parameters_ssl_comboBox">
-           <item>
-            <property name="text">
-             <string>disabled</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>allow</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>prefer</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>require</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>verify-ca</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>verify-full</string>
-            </property>
-           </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="parameters_host_lineEdit">
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
           </widget>
          </item>
          <item row="2" column="1">
@@ -117,45 +100,51 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="parameters_host_lineEdit">
+         <item row="4" column="1">
+          <widget class="QLineEdit" name="parameters_user_lineEdit">
            <property name="clearButtonEnabled">
             <bool>true</bool>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_9">
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_8">
            <property name="text">
-            <string>Host</string>
+            <string>User</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="label_8">
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_10">
            <property name="text">
-            <string>User</string>
+            <string>Port</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <widget class="QLineEdit" name="parameters_user_lineEdit">
-           <property name="clearButtonEnabled">
-            <bool>true</bool>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_9">
+           <property name="text">
+            <string>Host</string>
            </property>
           </widget>
          </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="label_12">
+         <item row="6" column="0">
+          <widget class="QLabel" name="label_3">
            <property name="text">
-            <string>Password</string>
+            <string>Database</string>
            </property>
           </widget>
          </item>
-         <item row="5" column="1">
-          <widget class="QLineEdit" name="parameters_password_lineEdit">
-           <property name="clearButtonEnabled">
-            <bool>true</bool>
+         <item row="6" column="1">
+          <widget class="QLineEdit" name="parameters_database_lineEdit">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the database used to connect to the cluster. It must already exist.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="placeholderText">
+            <string>postgres</string>
            </property>
           </widget>
          </item>

{oqtopus-0.1.15 → oqtopus-0.1.17}/oqtopus/ui/project_widget.ui

@@ -26,8 +26,11 @@
      <property name="text">
       <string>-</string>
      </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
      <property name="textInteractionFlags">
-      <set>Qt::NoTextInteraction</set>
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>

{oqtopus-0.1.15 → oqtopus-0.1.17}/oqtopus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oqtopus
-Version: 0.1.15
+Version: 0.1.17
 Summary: A QGIS module manager
 Author-email: Damiano Lombardi <damiano@opengis.ch>
 License:                     GNU GENERAL PUBLIC LICENSE

{oqtopus-0.1.15 → oqtopus-0.1.17}/oqtopus/gui/module_selection_widget.py

@@ -213,19 +213,19 @@ class ModuleSelectionWidget(QWidget, DIALOG_UI):
         self.module_information_label.setText(loading_text)
 
     def __seeChangeLogClicked(self):
-        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
+        if self.__current_module_package is None:
             QMessageBox.warning(
                 self,
                 self.tr("Can't open changelog"),
-                self.tr("Changelog is not available for Zip packages."),
+                self.tr("Please select a module and version first."),
             )
             return
 
-        if self.__current_module_package is None:
+        if self.__current_module_package.type == ModulePackage.Type.FROM_ZIP:
             QMessageBox.warning(
                 self,
                 self.tr("Can't open changelog"),
-                self.tr("Please select a module and version first."),
+                self.tr("Changelog is not available for Zip packages."),
             )
             return