oqtopus 0.1.18__tar.gz → 0.1.19__tar.gz

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

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

{oqtopus-0.1.18 → oqtopus-0.1.19}/oqtopus/core/module.py

@@ -3,7 +3,7 @@ import json
 from qgis.PyQt.QtCore import QByteArray, QObject, QUrl, pyqtSignal
 from qgis.PyQt.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
 
-from ..utils.plugin_utils import PluginUtils
+from ..utils.plugin_utils import PluginUtils, logger
 from .module_package import ModulePackage
 
 
@@ -25,8 +25,9 @@ class Module(QObject):
         return f"Module(name={self.name}, organisation={self.organisation}, repository={self.repository})"
 
     def start_load_versions(self):
-        url = QUrl(f"https://api.github.com/repos/{self.organisation}/{self.repository}/releases")
-        request = QNetworkRequest(url)
+        url = f"https://api.github.com/repos/{self.organisation}/{self.repository}/releases"
+        logger.info(f"Loading versions from '{url}'...")
+        request = QNetworkRequest(QUrl(url))
         headers = PluginUtils.get_github_headers()
         for key, value in headers.items():
             request.setRawHeader(QByteArray(key.encode()), QByteArray(value.encode()))
@@ -83,8 +84,10 @@ class Module(QObject):
         )
         self.development_versions.append(mainVersion)
 
-        url = QUrl(f"https://api.github.com/repos/{self.organisation}/{self.repository}/pulls")
-        request = QNetworkRequest(url)
+        url = f"https://api.github.com/repos/{self.organisation}/{self.repository}/pulls"
+        logger.info(f"Loading development versions from '{url}'...")
+
+        request = QNetworkRequest(QUrl(url))
         headers = PluginUtils.get_github_headers()
         for key, value in headers.items():
             request.setRawHeader(QByteArray(key.encode()), QByteArray(value.encode()))

{oqtopus-0.1.18 → oqtopus-0.1.19}/oqtopus/core/module_package.py

@@ -116,3 +116,8 @@ class ModulePackage:
         self.created_at = QDateTime.fromString(json_payload["created_at"], Qt.DateFormat.ISODate)
         self.prerelease = False
         self.html_url = json_payload["html_url"]
+
+        is_on_a_fork = json_payload["head"]["repo"]["fork"]
+        if is_on_a_fork:
+            self.organisation = json_payload["head"]["repo"]["owner"]["login"]
+            self.repository = json_payload["head"]["repo"]["name"]

{oqtopus-0.1.18 → oqtopus-0.1.19}/oqtopus/gui/logs_widget.py

@@ -62,6 +62,11 @@ class LogModel(QAbstractItemModel):
             | Qt.ItemFlag.ItemNeverHasChildren
         )
 
+    def clear(self):
+        self.beginResetModel()
+        self.logs = []
+        self.endResetModel()
+
 
 class LogFilterProxyModel(QSortFilterProxyModel):
     LEVELS = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]

{oqtopus-0.1.18 → oqtopus-0.1.19}/oqtopus/gui/module_widget.py

@@ -8,6 +8,7 @@ from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QMessageBox, QWidget
 
 from ..core.module import Module
+from ..core.module_package import ModulePackage
 from ..utils.plugin_utils import PluginUtils, logger
 from ..utils.qt_utils import CriticalMessageBox, OverrideCursor, QtUtils
 
@@ -81,7 +82,16 @@ class ModuleWidget(QWidget, DIALOG_UI):
 
         logger.info(f"PUM config loaded from '{pumConfigFilename}'")
 
-        self.parameters_groupbox.setParameters(self.__pum_config.parameters())
+        try:
+            self.parameters_groupbox.setParameters(self.__pum_config.parameters())
+        except Exception as exception:
+            CriticalMessageBox(
+                self.tr("Error"),
+                self.tr(f"Can't load parameters from PUM config '{pumConfigFilename}':"),
+                exception,
+                self,
+            ).exec()
+            return
 
         self.db_demoData_comboBox.clear()
         for demo_data_name, demo_data_file in self.__pum_config.demo_data().items():
@@ -107,9 +117,19 @@ class ModuleWidget(QWidget, DIALOG_UI):
             ).exec()
             return
 
-        parameters = self.parameters_groupbox.parameters_values()
-
         try:
+            parameters = self.parameters_groupbox.parameters_values()
+
+            beta_testing = False
+            if (
+                self.__current_module_package.type == ModulePackage.Type.PULL_REQUEST
+                or self.__current_module_package.type == ModulePackage.Type.BRANCH
+            ):
+                logger.warning(
+                    "Installing module from branch or pull request: set parameter beta_testing to True"
+                )
+                beta_testing = True
+
             upgrader = Upgrader(
                 config=self.__pum_config,
             )
@@ -119,6 +139,7 @@ class ModuleWidget(QWidget, DIALOG_UI):
                     connection=self.__database_connection,
                     roles=self.db_parameters_CreateAndGrantRoles_checkBox.isChecked(),
                     grant=self.db_parameters_CreateAndGrantRoles_checkBox.isChecked(),
+                    beta_testing=beta_testing,
                 )
 
                 if self.db_demoData_checkBox.isChecked():

{oqtopus-0.1.18 → oqtopus-0.1.19}/oqtopus/gui/parameters_groupbox.py

@@ -20,21 +20,21 @@ class ParameterWidget(QWidget):
         self.layout.setContentsMargins(0, 0, 0, 0)
         self.setLayout(self.layout)
         self.value = None
-        self.__valueChanged = False
 
         if parameter_definition.type != ParameterType.BOOLEAN:
             self.layout.addWidget(QLabel(parameter_definition.name, self))
 
         if parameter_definition.type == ParameterType.BOOLEAN:
             self.widget = QCheckBox(parameter_definition.name, self)
-            self.widget.setChecked(parameter_definition.default)
-            self.widget.checked.connect(self.__valueChanged)
+            if parameter_definition.default is not None:
+                self.widget.setChecked(parameter_definition.default)
             self.layout.addWidget(self.widget)
             self.value = lambda: self.widget.isChecked()
         elif parameter_definition.type in (
             ParameterType.DECIMAL,
             ParameterType.INTEGER,
             ParameterType.TEXT,
+            ParameterType.PATH,
         ):
             self.widget = QLineEdit(self)
             if parameter_definition.default is not None:
@@ -46,6 +46,8 @@ class ParameterWidget(QWidget):
                 self.value = lambda: float(self.widget.text() or self.widget.placeholderText())
             else:
                 self.value = lambda: self.widget.text() or self.widget.placeholderText()
+        else:
+            raise ValueError(f"Unknown parameter type '{parameter_definition.type}'")
 
 
 class ParametersGroupBox(QGroupBox):

{oqtopus-0.1.18 → oqtopus-0.1.19}/oqtopus/gui/plugin_widget.py

@@ -73,7 +73,9 @@ class PluginWidget(QWidget, DIALOG_UI):
         QMessageBox.warning(
             self,
             self.tr("Not implemented"),
-            self.tr("Installation is not implemented yet."),
+            self.tr(
+                'Installation is not implemented yet.\nAt the moment, you can only copy the plugin zip file to a directory and use "Install from ZIP" in QGIS.'
+            ),
         )
         return
 

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

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>513</width>
-    <height>540</height>
+    <height>542</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -64,6 +64,9 @@
         <layout class="QGridLayout" name="gridLayout_5">
          <item row="5" column="1">
           <widget class="QLineEdit" name="parameters_password_lineEdit">
+           <property name="echoMode">
+            <enum>QLineEdit::PasswordEchoOnEdit</enum>
+           </property>
            <property name="clearButtonEnabled">
             <bool>true</bool>
            </property>

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

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