oqtopus 0.1.19__tar.gz → 0.1.20__tar.gz

{oqtopus-0.1.19 → oqtopus-0.1.20}/PKG-INFO

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

{oqtopus-0.1.19 → oqtopus-0.1.20}/oqtopus/gui/database_connection_widget.py

@@ -152,9 +152,18 @@ class DatabaseConnectionWidget(QWidget, DIALOG_UI):
         databaseDuplicateDialog = DatabaseDuplicateDialog(
             selected_service=self.db_services_comboBox.currentText(), parent=self
         )
+
+        # Close the current connection otherwise it will block the database duplication
+        if self.__database_connection is not None:
+            self.__database_connection.close()
+            self.__database_connection = None
+
         if databaseDuplicateDialog.exec() == QDialog.DialogCode.Rejected:
+            self.__serviceChanged()
             return
 
+        self.__loadDatabaseInformations()
+
     def __set_connection(self, connection):
         """
         Set the current database connection and emit the signal_connectionChanged signal.

{oqtopus-0.1.19 → oqtopus-0.1.20}/oqtopus/gui/database_create_dialog.py

@@ -73,8 +73,6 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
         self.parameters_port_lineEdit.setPlaceholderText(DEFAULT_PG_PORT)
         self.parameters_database_lineEdit.setPlaceholderText(DEFAULT_PG_DB)
 
-        self.database_lineEdit.textChanged.connect(self._databaseTextChanged)
-
         self.buttonBox.accepted.connect(self._accept)
 
         if self.existingService_comboBox.count() > 0:
@@ -106,9 +104,6 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
     def _enterManuallyToggled(self, checked):
         self.parameters_frame.setEnabled(checked)
 
-    def _databaseTextChanged(self, text):
-        self.database_label.setText(text)
-
     def _accept(self):
         service_name = self.created_service_name()
 
@@ -193,9 +188,10 @@ class DatabaseCreateDialog(QDialog, DIALOG_UI):
             service_name = self.existingService_comboBox.currentText()
             existing_settings = pgserviceparser_service_config(service_name)
             settings.update(existing_settings)
-            # Overwrite dbname with the new database name
-            if self.database_lineEdit.text():
-                settings["dbname"] = self.database_lineEdit.text()
+
+        # Overwrite dbname with the new database name
+        if self.database_lineEdit.text():
+            settings["dbname"] = self.database_lineEdit.text()
 
         return settings
 

{oqtopus-0.1.19 → oqtopus-0.1.20}/oqtopus/gui/database_duplicate_dialog.py

@@ -23,11 +23,13 @@
 # ---------------------------------------------------------------------
 
 import psycopg
+from pgserviceparser import full_config as pgserviceparser_full_config
 from pgserviceparser import service_config as pgserviceparser_service_config
+from pgserviceparser import write_service as pgserviceparser_write_service
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 
-from ..utils.plugin_utils import PluginUtils
+from ..utils.plugin_utils import PluginUtils, logger
 from ..utils.qt_utils import OverrideCursor
 
 DIALOG_UI = PluginUtils.get_ui_class("database_duplicate_dialog.ui")
@@ -61,6 +63,23 @@ class DatabaseDuplicateDialog(QDialog, DIALOG_UI):
 
         except Exception as exception:
             errorText = self.tr(f"Can't connect to service '{service_name}':\n{exception}.")
+            logger.error(errorText)
+            QMessageBox.critical(self, "Error", errorText)
+            return
+
+        # Create new service configuration
+        new_service_name = self.newService_lineEdit.text()
+
+        # Check if the new service name is already in use
+        try:
+            if new_service_name in pgserviceparser_full_config():
+                errorText = self.tr(f"Service name '{new_service_name}' is already in use.")
+                logger.error(errorText)
+                QMessageBox.critical(self, "Error", errorText)
+                return
+        except Exception as e:
+            errorText = self.tr(f"Error checking existing service names:\n{e}.")
+            logger.error(errorText)
             QMessageBox.critical(self, "Error", errorText)
             return
 
@@ -75,25 +94,27 @@ class DatabaseDuplicateDialog(QDialog, DIALOG_UI):
                     )
         except psycopg.Error as e:
             errorText = self.tr(f"Error duplicating database:\n{e}.")
+            logger.error(errorText)
             QMessageBox.critical(self, "Error", errorText)
             return
         finally:
             database_connection.close()
 
-        # Create new service configuration
-        new_service_name = self.newService_lineEdit.text()
-        new_service_config = pgserviceparser_service_config(
-            new_service_name,
-            dbname=new_database_name,
-            host=self.__existing_service_config.get("host", ""),
-            port=self.__existing_service_config.get("port", ""),
-            user=self.__existing_service_config.get("user", ""),
-            password=self.__existing_service_config.get("password", ""),
-        )
+        # Write the new service configuration
         try:
-            pgserviceparser_service_config.write_service_config(new_service_config)
+            new_service_config = {
+                "dbname": new_database_name,
+                "host": self.__existing_service_config.get("host", ""),
+                "port": self.__existing_service_config.get("port", ""),
+                "user": self.__existing_service_config.get("user", ""),
+                "password": self.__existing_service_config.get("password", ""),
+            }
+            pgserviceparser_write_service(
+                new_service_name, new_service_config, create_if_not_found=True
+            )
         except Exception as e:
             errorText = self.tr(f"Error writing new service configuration:\n{e}.")
+            logger.error(errorText)
             QMessageBox.critical(self, "Error", errorText)
             return
 

{oqtopus-0.1.19 → oqtopus-0.1.20}/oqtopus/ui/database_create_dialog.ui

@@ -11,13 +11,16 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Create Service</string>
+   <string>Create Database</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_2">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To issue a &lt;span style=&quot; font-style:italic;&quot;&gt;CREATE DATABASE&lt;/span&gt; command, you must first be connected to the PostgreSQL server. Select an existing administrative connection (often named postgres) from a service or manually.&lt;br/&gt;This connection is used to perform the creation action, and as a template for the new service to be created.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
      <property name="title">
-      <string>Create database</string>
+      <string>Connection to use</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="1">
@@ -164,25 +167,6 @@
         </attribute>
        </widget>
       </item>
-      <item row="6" column="1">
-       <widget class="QLineEdit" name="database_lineEdit">
-        <property name="font">
-         <font>
-          <italic>false</italic>
-         </font>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Database</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QRadioButton" name="useService_radioButton">
         <property name="text">
@@ -202,35 +186,48 @@
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Create service</string>
+      <string>New database</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="0">
+      <item row="1" column="0">
        <widget class="QLabel" name="label">
+        <property name="toolTip">
+         <string>Enter a convenient alias that will be created in your pg_service.conf file.</string>
+        </property>
         <property name="text">
-         <string>Service</string>
+         <string>Service name</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="service_lineEdit"/>
-      </item>
       <item row="1" column="1">
-       <widget class="QLabel" name="database_label">
-        <property name="font">
-         <font>
-          <italic>true</italic>
-         </font>
+       <widget class="QLineEdit" name="service_lineEdit">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a convenient alias that will be created in your &lt;span style=&quot; font-style:italic;&quot;&gt;pg_service.conf&lt;/span&gt; file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="toolTip">
+         <string>Enter the actual name for the new database as it will exist inside your PostgreSQL installation.</string>
         </property>
         <property name="text">
-         <string>-</string>
+         <string>Database name</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="database_lineEdit">
+        <property name="font">
+         <font>
+          <italic>false</italic>
+         </font>
+        </property>
+        <property name="toolTip">
+         <string>Enter the actual name for the new database as it will exist inside your PostgreSQL installation.</string>
+        </property>
         <property name="text">
-         <string>Database</string>
+         <string/>
         </property>
        </widget>
       </item>

{oqtopus-0.1.19 → oqtopus-0.1.20}/oqtopus.egg-info/PKG-INFO

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