oqtopus 0.1.18__py3-none-any.whl → 0.1.19__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → oqtopus-0.1.19.dist-info}/METADATA

@@ -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.dist-info → oqtopus-0.1.19.dist-info}/RECORD

@@ -1,9 +1,9 @@
 oqtopus/__init__.py,sha256=PUl5ObSgoyF6tcNphBip9Rff8lul0t9VobiwsLKwgFA,104
 oqtopus/oqtopus.py,sha256=BF_JSF2oOCzc8Qr7Z0B7FJdYrdAR3FR9L7oXh3QatL4,1860
 oqtopus/oqtopus_plugin.py,sha256=Mpyk6xIgZ1wehBzv70xc6OfddiHQYfXnU6-2E6dDihs,5815
-oqtopus/core/module.py,sha256=XOGI7R_2LyoscXAA-hCTKu7KjJ6ppAPgVFwrtSBiWTA,4631
+oqtopus/core/module.py,sha256=47iDvEOXFNWY77cbi7LhQs5qTUwRNuauieqNTPf9UKY,4766
 oqtopus/core/module_asset.py,sha256=qr_wwriJ_rZd86EuBo_Rx-MDCDJNYA6odhk6F-Z6YFA,467
-oqtopus/core/module_package.py,sha256=ilMWlArVmvULhoKHEXg7hNwiE6pLUsAMkLwtOes4j5A,3726
+oqtopus/core/module_package.py,sha256=sYCnKMOMW4R9ULP3oresDNMAaFEb8y_pLa4Lvjdl7RI,3958
 oqtopus/core/modules_config.py,sha256=iEN_JYuFuGpF4dyfnmcJPfp_bIzrn_PNbq9G1DElyCg,186
 oqtopus/core/package_prepare_task.py,sha256=YqIjUbCqDyCd5t0Un71ECgY0LW_uFFxuXyO701nXZ_M,5483
 oqtopus/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,18 +11,18 @@ oqtopus/gui/about_dialog.py,sha256=dDNwHxKf_M82Z-TKmXW1fXmnI_WSV_7MShqz05trzRw,2
 oqtopus/gui/database_connection_widget.py,sha256=7wFO1ysGwoNoXFFakNz6TktwOm28z3dRmbVxavIXX0E,6375
 oqtopus/gui/database_create_dialog.py,sha256=afltzI1s9B0QGnZl6mgsX-0EvwOUArMu1Vxar4RsYvs,9055
 oqtopus/gui/database_duplicate_dialog.py,sha256=Oz8pob6HxZHbV5Thcrhy4dPvGEI4_brSxw9KIcTc2ZE,4017
-oqtopus/gui/logs_widget.py,sha256=B9Kbwt6cD40CV5mfcyaHZ5foJIPvWRednbxIRdeRgpU,6593
+oqtopus/gui/logs_widget.py,sha256=lxP0rZYUF4ahR7RtM3SJCbk5nk70SVC9Ien6TvBsflY,6698
 oqtopus/gui/main_dialog.py,sha256=7nxn4vL5fIege0qBPP1mrOp5jP0YWXFJ_k_ywGeKD8M,6362
 oqtopus/gui/module_selection_widget.py,sha256=57M9sM_VhD5lAfxqOxEPWUHiB2Ty6EQQkRnvAZ0VSv8,16116
-oqtopus/gui/module_widget.py,sha256=ev8LoYVREg45mLLU9qu5bPhS4uDiayFAAy8e2zoLk-c,7618
-oqtopus/gui/parameters_groupbox.py,sha256=Lgwv76epIvZOZA0y9sxNcbuZ0Tun-ObUzvOa6eM3EzM,2842
-oqtopus/gui/plugin_widget.py,sha256=BDtheJ35yrk55Th0vHulHe99jsJUMY11lKBgrHHmkiE,5622
+oqtopus/gui/module_widget.py,sha256=WEE0paMIbRDfJ2KvIByZtHK4H1TULXLBFb1c4ydQttg,8443
+oqtopus/gui/parameters_groupbox.py,sha256=ZXoIbTDrpoe_SfxyYr7mNbQOi0vHAJSW8cPIXzGKdmE,2938
+oqtopus/gui/plugin_widget.py,sha256=8av8KI3p8gnXOlSssB5-dFVvq4vaLfqGjY9NVSNiBb0,5757
 oqtopus/gui/project_widget.py,sha256=T34MyHzHgKw1Dl6V67MKPneSd9DDgrWhuhj7mrcvjSg,6696
 oqtopus/gui/settings_dialog.py,sha256=wgwVCuAIBh9iLrs9y5HfE99LrTV0rEYbL3frMBlW0cQ,1547
 oqtopus/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oqtopus/ui/about_dialog.ui,sha256=2oa5u3LIvN3prHyELUG-bwDuEHlBn9-uuA4CwYsEARo,6236
 oqtopus/ui/database_connection_widget.ui,sha256=0hLBaOx0KcLTH6RlkziVj-tsczjHDUGC-3EXQYgcTuE,3729
-oqtopus/ui/database_create_dialog.ui,sha256=wM_x54bfgdSaShdx6MwBgDx_R-O_ckeoynEhFjs-Sws,8261
+oqtopus/ui/database_create_dialog.ui,sha256=4xP4L5wrXAZH7NVdnyiRTgvI-JykLzH5oH-FXHASWQM,8377
 oqtopus/ui/database_duplicate_dialog.ui,sha256=EzMRYhlxsiP_sr9ixBJn4lnefM5R_p1oXx4RCyMAj9U,3826
 oqtopus/ui/logs_widget.ui,sha256=oAgEtRUBXB-DzLC0vmBP-PEA-Uu3d3ppFm0ahs1jHQI,2785
 oqtopus/ui/main_dialog.ui,sha256=mB_VeJ-4wXJm3UTS5leGg_ZgFwgBJaS1QruBqnYMh6U,2650
@@ -36,10 +36,10 @@ oqtopus/utils/plugin_utils.py,sha256=v-Oxu2zs8tQWzEdHnwEl1mseapyvpPS-lHimJNK2zHY
 oqtopus/utils/qt_utils.py,sha256=HPe9tOQQH9R9xZp4rGphVhSJO7220q368xmreDu5-6g,3243
 oqtopus/utils/tmmtlogging.py,sha256=BSAPrhQGCuH2boMG4bP8QFyLfoss1uR4pO_pXjTA1eQ,1733
 oqtopus/utils/translation.py,sha256=p1d5N6CYIf94fGYdPQnJamdum9MVBlPkJ24c557rqdg,2647
-oqtopus-0.1.18.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+oqtopus-0.1.19.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
 tests/__init__.py,sha256=z5CxS92efenLcDm64Sifx26EjZBCWPO4oVvaEEHJJ6w,444
 tests/test_plugin_load.py,sha256=HuVLdrsn2PSjKIrvcLj0EH7vNE8-0jBMmHZHihsqB3Q,517
-oqtopus-0.1.18.dist-info/METADATA,sha256=qk2WDV_BKgW05EmceSuaW1IwRFs-ChcbsxX5Eof4QbY,21475
-oqtopus-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oqtopus-0.1.18.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
-oqtopus-0.1.18.dist-info/RECORD,,
+oqtopus-0.1.19.dist-info/METADATA,sha256=Dc2t_sJ8p4179aLZl3aOPterDx9_sB31H9STTDN5LhY,21475
+oqtopus-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oqtopus-0.1.19.dist-info/top_level.txt,sha256=i4DHi21kcGIzrF8DlgsKj-UCENHg_NebTRac7cwt32A,14
+oqtopus-0.1.19.dist-info/RECORD,,