Config file

Author: domi4484

oqtopus.py

@@ -1,18 +1,45 @@
+import os
 import sys
+import types
 
-try:
-    from qgis.PyQt.QtWidgets import QApplication
-except ImportError:
-    from PyQt5.QtWidgets import QApplication  # Or PyQt6 if your project uses it
+from PyQt5.QtGui import QIcon
 
-from oqtopus.core.modules_registry import ModulesRegistry
-from oqtopus.gui.main_dialog import MainDialog
+# Create fake qgis.PyQt modules that point to PyQt5 modules
+pyqt5_widgets = __import__("PyQt5.QtWidgets", fromlist=[""])
+pyqt5_core = __import__("PyQt5.QtCore", fromlist=[""])
+pyqt5_gui = __import__("PyQt5.QtGui", fromlist=[""])
+pyqt5_uic = __import__("PyQt5.uic", fromlist=[""])
+
+# Create the qgis, qgis.PyQt, and submodules in sys.modules
+qgis = types.ModuleType("qgis")
+pyqt = types.ModuleType("qgis.PyQt")
+pyqt.QtWidgets = pyqt5_widgets
+pyqt.QtCore = pyqt5_core
+pyqt.QtGui = pyqt5_gui
+pyqt.uic = pyqt5_uic
+
+qgis.PyQt = pyqt
+sys.modules["qgis"] = qgis
+sys.modules["qgis.PyQt"] = pyqt
+sys.modules["qgis.PyQt.QtWidgets"] = pyqt5_widgets
+sys.modules["qgis.PyQt.QtCore"] = pyqt5_core
+sys.modules["qgis.PyQt.QtGui"] = pyqt5_gui
+sys.modules["qgis.PyQt.uic"] = pyqt5_uic
+
+from oqtopus.core.modules_config import load_modules_from_conf  # noqa: E402
+from oqtopus.gui.main_dialog import MainDialog  # noqa: E402
 
 
 def main():
-    app = QApplication(sys.argv)
-    modules_registry = ModulesRegistry()
-    dialog = MainDialog(modules_registry)
+    app = pyqt5_widgets.QApplication(sys.argv)
+    icon = QIcon("oqtopus/icons/oqtopus-logo.png")
+    app.setWindowIcon(icon)
+
+    conf_path = os.path.join(os.path.dirname(__file__), "oqtopus/default_config.conf")
+    modules_config = load_modules_from_conf(conf_path)
+
+    dialog = MainDialog(modules_config)
+    dialog.setWindowIcon(icon)
     dialog.show()
     sys.exit(app.exec_())
 

oqtopus/core/modules_config.py

@@ -0,0 +1,20 @@
+from typing import List
+
+import tomli
+from pydantic import BaseModel
+
+
+class ModuleConfig(BaseModel):
+    name: str
+    organisation: str
+    repository: str
+
+
+class ModulesConfig(BaseModel):
+    modules: List[ModuleConfig]
+
+
+def load_modules_from_conf(conf_path: str) -> ModulesConfig:
+    with open(conf_path, "rb") as f:
+        data = tomli.load(f)
+    return ModulesConfig(**data)

oqtopus/core/modules_registry.py

@@ -0,0 +1,14 @@
+[[modules]]
+name = "OPENGIS.ch Wastewater"
+organisation = "opengisch"
+repository = "wastewater"
+
+[[modules]]
+name = "TEKSI Wastewater"
+organisation = "teksi"
+repository = "wastewater"
+
+[[modules]]
+name = "TEKSI District Heating"
+organisation = "teksi"
+repository = "district_heating"

oqtopus/default_config.conf

@@ -39,6 +39,7 @@
     QTreeWidgetItem,
 )
 
+from ..core.module import Module
 from ..core.package_prepare_task import PackagePrepareTask
 from ..libs import pgserviceparser
 from ..libs.pum.config import PumConfig
@@ -60,7 +61,7 @@ class MainDialog(QDialog, DIALOG_UI):
     COLOR_GREEN = QColor(12, 167, 137)
     COLOR_WARNING = QColor(255, 165, 0)
 
-    def __init__(self, modules_registry, parent=None):
+    def __init__(self, modules_config, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
@@ -71,7 +72,7 @@ def __init__(self, modules_registry, parent=None):
         self.buttonBox.rejected.connect(self.__closeDialog)
         self.buttonBox.helpRequested.connect(self.__helpRequested)
 
-        self.__modules_registry = modules_registry
+        self.__modules_config = modules_config
         self.__current_module = None
 
         self.__database_connection = None
@@ -107,7 +108,10 @@ def __init__(self, modules_registry, parent=None):
     def __initGuiModules(self):
         self.module_module_comboBox.clear()
         self.module_module_comboBox.addItem(self.tr("Please select a module"), None)
-        for module in self.__modules_registry.modules():
+        for config_module in self.__modules_config.modules:
+            module = Module(
+                config_module.name, config_module.organisation, config_module.repository
+            )
             self.module_module_comboBox.addItem(module.name, module)
 
         self.module_latestVersion_label.setText("")

oqtopus/gui/main_dialog.py

@@ -1,8 +1,9 @@
+import os
+
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QAction, QApplication
 
-from .core.module import Module
-from .core.modules_registry import ModulesRegistry
+from .core.modules_config import load_modules_from_conf
 from .gui.about_dialog import AboutDialog
 from .gui.main_dialog import MainDialog
 from .utils.plugin_utils import PluginUtils, logger
@@ -32,18 +33,8 @@ def __init__(self, iface):
         self.actions = []
         self.main_menu_name = self.tr(f"&{PluginUtils.PLUGIN_NAME}")
 
-        self.modules_registry = ModulesRegistry()
-        self.modules_registry.register_module(
-            Module(name="OPENGIS.ch Wastewater", organisation="opengisch", repository="wastewater")
-        )
-        self.modules_registry.register_module(
-            Module(name="TEKSI Wastewater", organisation="teksi", repository="wastewater")
-        )
-        self.modules_registry.register_module(
-            Module(
-                name="TEKSI District Heating", organisation="teksi", repository="district_heating"
-            )
-        )
+        conf_path = os.path.join(os.path.dirname(__file__), "../default_config.conf")
+        self.modules_config = load_modules_from_conf(conf_path)
 
     # noinspection PyMethodMayBeStatic
     def tr(self, source_text):
@@ -163,7 +154,7 @@ def unload(self):
             self.iface.removeToolBarIcon(action)
 
     def show_main_dialog(self):
-        main_dialog = MainDialog(self.modules_registry, self.iface.mainWindow())
+        main_dialog = MainDialog(self.modules_config, self.iface.mainWindow())
         main_dialog.exec_()
 
     def show_logs_folder(self):

oqtopus/oqtopus_plugin.py

@@ -16,7 +16,7 @@
  ***************************************************************************/
 """
 
-from PyQt5.QtWidgets import QApplication
+from qgis.PyQt.QtWidgets import QApplication
 
 
 class OverrideCursor: