Fixed downloading procedure and minor things

svir/dialogs/import_gv_map_dialog.py

@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+# /***************************************************************************
+# Irmt
+#                                 A QGIS plugin
+# OpenQuake Integrated Risk Modelling Toolkit
+#                              -------------------
+#        begin                : 2020-01-23
+#        copyright            : (C) 2020 by GEM Foundation
+#        email                : devops@openquake.org
+# ***************************************************************************/
+#
+# OpenQuake is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenQuake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with OpenQuake.  If not, see <http://www.gnu.org/licenses/>.
+
+import json
+import traceback
+import tempfile
+import requests
+import zipfile
+import os
+from requests import Session
+from qgis.core import QgsProject
+from qgis.PyQt.QtCore import QSettings
+from qgis.PyQt.QtWidgets import (
+    QDialog, QMessageBox, QTableWidgetItem, QPushButton)
+from svir.utilities.utils import (
+    get_ui_class, log_msg, geoviewer_login, get_credentials)
+from svir.utilities.shared import DEFAULT_GEOVIEWER_PROFILES
+
+BUTTON_WIDTH = 75
+
+FORM_CLASS = get_ui_class('ui_import_gv_map.ui')
+
+
+class ImportGvMapDialog(QDialog, FORM_CLASS):
+    """
+    Dialog listing maps available on a connected OqGeoviewer, showing map
+    properties and a button to download the map as a QGIS project
+    """
+    def __init__(self, message_bar):
+        self.message_bar = message_bar
+        QDialog.__init__(self)
+        # Set up the user interface from Designer.
+        self.setupUi(self)
+        self.session = Session()
+        self.authenticate()
+        map_list = self.get_map_list()
+        if not map_list:
+            self.reject()
+            return
+        self.show_map_list(map_list)
+
+    def authenticate(self):
+        self.hostname, username, password = get_credentials('geoviewer')
+        geoviewer_login(self.hostname, username, password, self.session)
+
+    def show_map_list(self, map_list):
+        if not map_list:
+            return
+        fields_to_display = map_list[0]['fields']
+        self.list_of_maps_tbl.setRowCount(len(map_list))
+        self.list_of_maps_tbl.setColumnCount(len(fields_to_display) + 1)
+        for row, map in enumerate(map_list):
+            for col, field in enumerate(fields_to_display):
+                item = QTableWidgetItem(str(map['fields'][field]))
+                self.list_of_maps_tbl.setItem(row, col, item)
+                self.list_of_maps_tbl.setHorizontalHeaderItem(
+                    col, QTableWidgetItem(field))
+            # if True:  # map['fields']['downloadable']:
+                button = QPushButton('Download')
+                self.list_of_maps_tbl.setCellWidget(
+                    row, len(fields_to_display), button)
+                self.list_of_maps_tbl.setColumnWidth(col, BUTTON_WIDTH)
+                button.clicked.connect(
+                    lambda checked=False,
+                    map_name=map['fields']['name'],
+                    map_slug=map['fields']['slug']:
+                        self.on_download_btn_clicked(map_name, map_slug))
+
+    def download_url(self, url, save_path, chunk_size=128):
+        r = requests.get(url, stream=True)
+        if not r.ok:
+            msg = 'Unable to download the selected map: %s' % r.reason
+            log_msg(msg, level='C', message_bar=self.message_bar)
+            self.reject()
+            return False
+        with open(save_path, 'wb') as fd:
+            for chunk in r.iter_content(chunk_size=chunk_size):
+                fd.write(chunk)
+            return True
+
+    def on_download_btn_clicked(self, map_name, map_slug):
+        msg = 'Downloading map %s (%s)' % (map_name, map_slug)
+        log_msg(msg, level='S', message_bar=self.message_bar)
+        map_download_url = '%s/map/%s/download' % (self.hostname, map_slug)
+        zip_file = tempfile.NamedTemporaryFile(suffix='.zip')
+        zip_file.close()
+        if not self.download_url(map_download_url, zip_file.name):
+            return
+        dirpath = tempfile.mkdtemp()
+        with zipfile.ZipFile(zip_file.name, 'r') as zip_ref:
+            zip_ref.extractall(dirpath)
+        log_msg('The project was downloaded into the folder: %s' % dirpath,
+                level='S')
+        for filename in os.listdir(dirpath):
+            if filename.endswith('.qgs'):
+                qgsfilepath = os.path.join(dirpath, filename)
+                project = QgsProject.instance()
+                project.read(qgsfilepath)
+                break
+
+    def get_map_list(self):
+        map_list_url = self.hostname + '/api/map_list/'
+        try:
+            resp = self.session.get(map_list_url, timeout=10)
+        except Exception:
+            msg = "Unable to retrieve the list of maps.\n%s" % (
+                traceback.format_exc())
+            log_msg(msg, level='C', message_bar=self.messageBar())
+            self.reject()
+            return
+        if resp.status_code != 200:  # 200 means successful:OK
+            msg = ('Unable to retrieve the list of maps: %s' % resp.text)
+            log_msg(msg, level='C', message_bar=self.messageBar())
+            self.reject()
+            return
+        map_list = json.loads(resp.text)
+        return map_list

svir/dialogs/upload_gv_proj_dialog.py

@@ -25,7 +25,6 @@
 import os
 import re
 import json
-import traceback
 import tempfile
 from requests import Session
 from qgis.server import QgsServerProjectUtils
@@ -34,15 +33,15 @@
     QgsProcessingUtils, QgsField, QgsFields, QgsFeature, QgsGeometry,
     QgsWkbTypes, QgsMemoryProviderUtils, QgsCoordinateReferenceSystem,
     QgsTask, QgsMapLayerType)
-from qgis.PyQt.QtCore import QSettings, QVariant, QDir, QFile
+from qgis.PyQt.QtCore import QVariant, QDir, QFile
 from qgis.PyQt.QtWidgets import (
     QDialog, QDialogButtonBox)
 from processing.gui.AlgorithmExecutor import execute
 from svir.tasks.consolidate_task import ConsolidateTask
 from svir.utilities.utils import (
     get_ui_class, log_msg, get_credentials, tr, geoviewer_login)
 from svir.utilities.shared import (
-    DEFAULT_GEOVIEWER_PROFILES, LICENSES, DEFAULT_LICENSE, PROJECT_KINDS,
+    LICENSES, DEFAULT_LICENSE, PROJECT_KINDS,
     DEFAULT_PROJECT_KIND)
 
 
@@ -185,6 +184,8 @@ def check_geometries(self):
                            " 'Basemaps'" % layer.name())
                     log_msg(msg, level='W', message_bar=self.message_bar)
                 continue
+            # FIXME: we could add a check to avoid warnings for layers that
+            # have no geometries (e.g. those used as data sources for joins)
             parameters['INPUT_LAYER'] = layer.id()
             ok, results = execute(
                 alg, parameters, context=context, feedback=feedback)

svir/irmt.py

@@ -61,7 +61,7 @@
 from svir.dialogs.viewer_dock import ViewerDock
 from svir.utilities.import_sv_data import get_loggedin_downloader
 from svir.dialogs.download_layer_dialog import DownloadLayerDialog
-from svir.dialogs.import_gv_proj_dialog import ImportGvProjDialog
+from svir.dialogs.import_gv_map_dialog import ImportGvMapDialog
 from svir.dialogs.upload_gv_proj_dialog import UploadGvProjDialog
 from svir.dialogs.projects_manager_dialog import ProjectsManagerDialog
 from svir.dialogs.select_sv_variables_dialog import SelectSvVariablesDialog
@@ -204,11 +204,13 @@ def initGui(self):
         self.menu_action = menu_bar.insertMenu(
             self.iface.firstRightStandardMenu().menuAction(), self.menu)
 
-        # Action to list OQ GeoViewer projects
-        self.add_menu_item("import_geoviewer_project",
+        # NOTE: we could either list maps and use the existing api to download
+        # maps or add a GeoViewer api to download projects
+        # Action to list OQ GeoViewer maps
+        self.add_menu_item("import_geoviewer_map",
                            ":/plugins/irmt/load_layer.svg",
-                           u"Import project from the OpenQuake &GeoViewer",
-                           self.import_geoviewer_project,
+                           u"Import map from the OpenQuake &GeoViewer",
+                           self.import_geoviewer_map,
                            enable=True,
                            add_to_layer_actions=False,
                            submenu='OQ GeoViewer')
@@ -818,17 +820,17 @@ def _data_download_successful(
                 layer.setFieldAlias(
                     field_idx, 'Country name')
 
-    def import_geoviewer_project(self):
+    def import_geoviewer_map(self):
         """
-        FIXME
+        Open dialog to import maps from a connected OQ-GeoViewer
         """
-        self.download_gv_proj_dlg = ImportGvProjDialog(
+        self.download_gv_map_dlg = ImportGvMapDialog(
             self.iface.messageBar())
-        self.download_gv_proj_dlg.exec_()
+        self.download_gv_map_dlg.exec_()
 
     def upload_project_to_geoviewer(self):
         """
-        FIXME
+        Open dialog to upload the current project to a connected OQ-GeoViewer
         """
         self.upload_gv_proj_dlg = UploadGvProjDialog(
             self.iface.messageBar(), parent=self.iface.mainWindow())

svir/ui/ui_import_gv_proj.ui → svir/ui/ui_import_gv_map.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DownloadGeoviewerProjectDialog</class>
- <widget class="QDialog" name="DownloadGeoviewerProjectDialog">
+ <class>DownloadGeoviewerMapDialog</class>
+ <widget class="QDialog" name="DownloadGeoviewerMapDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Download OQ-GeoViewer projects</string>
+   <string>Download OQ-GeoViewer map</string>
   </property>
   <property name="windowIcon">
    <iconset>
@@ -31,7 +31,7 @@
           <number>0</number>
          </property>
          <item>
-          <widget class="QLabel" name="list_of_projects_lbl">
+          <widget class="QLabel" name="list_of_maps_lbl">
            <property name="font">
             <font>
              <weight>75</weight>
@@ -40,14 +40,14 @@
             </font>
            </property>
            <property name="text">
-            <string>OpenQuake GeoViewer Projects</string>
+            <string>OpenQuake GeoViewer Maps</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
-        <widget class="QTableWidget" name="list_of_projects_tbl">
+        <widget class="QTableWidget" name="list_of_maps_tbl">
          <property name="editTriggers">
           <set>QAbstractItemView::NoEditTriggers</set>
          </property>