Download all assets

Author: domi4484

oqtopus.py

@@ -28,13 +28,16 @@
 
 from oqtopus.core.modules_config import load_modules_from_conf  # noqa: E402
 from oqtopus.gui.main_dialog import MainDialog  # noqa: E402
+from oqtopus.utils.plugin_utils import PluginUtils  # noqa: E402
 
 
 def main():
     app = pyqt5_widgets.QApplication(sys.argv)
     icon = QIcon("oqtopus/icons/oqtopus-logo.png")
     app.setWindowIcon(icon)
 
+    PluginUtils.init_logger()
+
     conf_path = os.path.join(os.path.dirname(__file__), "oqtopus/default_config.conf")
     modules_config = load_modules_from_conf(conf_path)
 

oqtopus/core/module_asset.py

@@ -0,0 +1,17 @@
+from enum import Enum
+
+
+class ModuleAsset:
+    class Type(Enum):
+        PLUGIN = "oqtopus.plugin"
+        DATAMODEL = "oqtopus.datamodel"
+        PROJECT = "oqtopus.project"
+
+    def __init__(
+        self, name: str, label: str, download_url: str, size: int, type: "ModuleAsset.Type" = None
+    ):
+        self.name = name
+        self.label = label
+        self.download_url = download_url
+        self.size = size
+        self.type = type

oqtopus/core/module_version.py

@@ -1,6 +1,8 @@
 import requests
 from qgis.PyQt.QtCore import QDateTime, Qt
 
+from .module_asset import ModuleAsset
+
 
 class ModuleVersion:
 
@@ -10,13 +12,6 @@ class Type:
         BRANCH = "branch"
         PULL_REQUEST = "pull_request"
 
-    class Asset:
-        def __init__(self, name: str, label: str, download_url: str, size: int):
-            self.name = name
-            self.label = label
-            self.download_url = download_url
-            self.size = size
-
     def __init__(
         self,
         organisation,
@@ -81,23 +76,26 @@ def __parse_release_assets(self, assets_url: str):
 
         json_assets = r.json()
         for json_asset in json_assets:
-
-            asset = ModuleVersion.Asset(
+            asset = ModuleAsset(
                 name=json_asset["name"],
                 label=json_asset["label"],
                 download_url=json_asset["browser_download_url"],
                 size=json_asset["size"],
+                type=None,
             )
 
-            if asset.label == "oqtopus_datamodel":
+            if asset.label == ModuleAsset.Type.DATAMODEL.value:
+                asset.type = ModuleAsset.Type.DATAMODEL
                 self.asset_datamodel = asset
                 continue
 
-            if asset.label == "oqtopus_project":
+            if asset.label == ModuleAsset.Type.PROJECT.value:
+                asset.type = ModuleAsset.Type.PROJECT
                 self.asset_project = asset
                 continue
 
-            if asset.label == "oqtopus_plugin":
+            if asset.label == ModuleAsset.Type.PLUGIN.value:
+                asset.type = ModuleAsset.Type.PLUGIN
                 self.asset_plugin = asset
                 continue
 

oqtopus/core/package_prepare_task.py

@@ -58,7 +58,7 @@ def run(self):
 
         try:
             if self.module_version is not None:
-                self.__download_module_version(self.module_version)
+                self.__download_module_assets(self.module_version)
 
             self.__extract_zip_file(self.zip_file)
 
@@ -67,10 +67,23 @@ def run(self):
             print(f"Erorr: {e}")
             self.lastError = e
 
-    def __download_module_version(self, module_version):
+    def __download_module_assets(self, module_version):
 
-        url = module_version.download_url
-        filename = module_version.name + ".zip"
+        if module_version.asset_datamodel is not None:
+            self.__download_module_asset(module_version.asset_datamodel)
+
+        self.__checkForCanceled()
+        if module_version.asset_project is not None:
+            self.__download_module_asset(module_version.asset_project)
+
+        self.__checkForCanceled()
+        if module_version.asset_plugin is not None:
+            self.__download_module_asset(module_version.asset_plugin)
+
+    def __download_module_asset(self, module_asset):
+
+        url = module_asset.download_url
+        filename = module_asset.type.value + ".zip"
 
         temp_dir = PluginUtils.plugin_temp_path()
         destination_directory = os.path.join(temp_dir, "Downloads")

oqtopus/gui/main_dialog.py

@@ -22,6 +22,7 @@
 #
 # ---------------------------------------------------------------------
 
+import logging
 import os
 import shutil
 
@@ -67,7 +68,7 @@ def __init__(self, modules_config, parent=None):
 
         self.loggingBridge = LoggingBridge()
         self.loggingBridge.loggedLine.connect(self.__logged_line)
-        logger.addHandler(self.loggingBridge)
+        logging.getLogger().addHandler(self.loggingBridge)
 
         self.buttonBox.rejected.connect(self.__closeDialog)
         self.buttonBox.helpRequested.connect(self.__helpRequested)

oqtopus/oqtopus_plugin.py

@@ -33,7 +33,7 @@ def __init__(self, iface):
         self.actions = []
         self.main_menu_name = self.tr(f"&{PluginUtils.PLUGIN_NAME}")
 
-        conf_path = os.path.join(os.path.dirname(__file__), "../default_config.conf")
+        conf_path = os.path.join(os.path.dirname(__file__), "default_config.conf")
         self.modules_config = load_modules_from_conf(conf_path)
 
     # noinspection PyMethodMayBeStatic

oqtopus/ui/main_dialog.ui

@@ -149,6 +149,9 @@
       </item>
       <item row="0" column="0" rowspan="4">
        <widget class="QTreeWidget" name="logs_treeWidget">
+        <property name="selectionMode">
+         <enum>QAbstractItemView::ContiguousSelection</enum>
+        </property>
         <column>
          <property name="text">
           <string>Level</string>