Merge pull request #549 from opengisch/drop

Allow source file (transfer or ili) drop

Author: signedav

QgisModelBaker/gui/drop_message.py

@@ -17,7 +17,9 @@
  *                                                                         *
  ***************************************************************************/
 """
+import os
 
+from PyQt5.QtCore import QSize
 from qgis.gui import QgsGui
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QDialog
@@ -29,14 +31,26 @@
 
 
 class DropMessageDialog(QDialog, DIALOG_UI):
-    def __init__(self, file_name, parent=None):
+    def __init__(self, dropped_files, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
+        self.setFixedSize(QSize())
         QgsGui.instance().enableAutoGeometryRestore(self)
+        file_list = "\n- ".join(
+            os.path.basename(path)
+            for path in dropped_files
+            if dropped_files.index(path) < 10
+        )
         self.info_label.setText(
             self.tr(
-                "Do you want to use the Model Baker plugin to handle file {}?"
-            ).format(file_name)
+                "Do you want to use the Model Baker plugin to handle the following {}?\n- {} {}"
+            ).format(
+                self.tr("files") if len(dropped_files) > 1 else self.tr("file"),
+                file_list,
+                self.tr("\nand {} more...").format(len(dropped_files) - 10)
+                if len(dropped_files) > 10
+                else "",
+            )
         )
         self.accepted.connect(lambda: self.handle_dropped_file_configuration(True))
         self.rejected.connect(lambda: self.handle_dropped_file_configuration(False))

QgisModelBaker/gui/options.py

@@ -17,6 +17,7 @@
  *                                                                         *
  ***************************************************************************/
 """
+import pathlib
 import webbrowser
 
 from qgis.PyQt.QtCore import QLocale, QModelIndex, QSettings, Qt, pyqtSignal
@@ -203,3 +204,34 @@ def keyPressEvent(self, e):
             _selected_indexes = self.selectedIndexes()
             self.space_pressed.emit(_selected_indexes[0])
         super(ModelListView, self).keyPressEvent(e)
+
+
+class FileDropListView(QListView):
+
+    ValidExtenstions = ["xtf", "XTF", "itf", "ITF", "ili"]
+
+    files_dropped = pyqtSignal(list)
+
+    def __init__(self, parent=None):
+        super(FileDropListView, self).__init__(parent)
+        self.setAcceptDrops(True)
+        self.setDragDropMode(QListView.InternalMove)
+
+    def dragEnterEvent(self, event):
+        for url in event.mimeData().urls():
+            if (
+                pathlib.Path(url.toLocalFile()).suffix[1:]
+                in FileDropListView.ValidExtenstions
+            ):
+                event.acceptProposedAction()
+                break
+
+    def dropEvent(self, event):
+        dropped_files = [
+            url.toLocalFile()
+            for url in event.mimeData().urls()
+            if pathlib.Path(url.toLocalFile()).suffix[1:]
+            in FileDropListView.ValidExtenstions
+        ]
+        self.files_dropped.emit(dropped_files)
+        event.acceptProposedAction()

QgisModelBaker/gui/workflow_wizard/import_source_selection_page.py

@@ -18,8 +18,6 @@
  ***************************************************************************/
 """
 
-import os
-import pathlib
 
 from qgis.core import QgsApplication
 from qgis.PyQt.QtCore import Qt
@@ -87,6 +85,9 @@ def __init__(self, parent, title):
         )
         self.add_button.setIcon(QgsApplication.getThemeIcon("/symbologyAdd.svg"))
         self.remove_button.setIcon(QgsApplication.getThemeIcon("/symbologyRemove.svg"))
+        self.source_list_view.files_dropped.connect(
+            self.workflow_wizard.append_dropped_files
+        )
 
     def nextId(self):
         self._disconnect_punch_slots()
@@ -168,15 +169,7 @@ def update_models_completer(self):
 
     def _add_row(self):
         source = self.input_line_edit.text()
-        if os.path.isfile(source):
-            name = pathlib.Path(source).name
-            type = pathlib.Path(source).suffix[1:]
-            path = source
-        else:
-            name = source
-            type = "model"
-            path = None
-        self.source_list_view.model().add_source(name, type, path)
+        self.workflow_wizard.add_source(source)
         self.input_line_edit.clearFocus()
         self.input_line_edit.clear()
 

QgisModelBaker/gui/workflow_wizard/workflow_wizard.py

@@ -17,6 +17,8 @@
  *                                                                         *
  ***************************************************************************/
 """
+import os
+import pathlib
 
 from qgis.PyQt.QtCore import QEventLoop, Qt, QTimer
 from qgis.PyQt.QtWidgets import QDialog, QSplitter, QVBoxLayout, QWizard
@@ -428,9 +430,25 @@ def get_topping_file_model(self, id_list, log_panel):
 
         return topping_file_cache.model
 
+    def add_source(self, source):
+        if os.path.isfile(source):
+            name = pathlib.Path(source).name
+            type = pathlib.Path(source).suffix[1:]
+            path = source
+        else:
+            name = source
+            type = "model"
+            path = None
+        self.source_model.add_source(name, type, path)
+
+    def append_dropped_files(self, dropped_files):
+        if dropped_files:
+            for dropped_file in dropped_files:
+                self.add_source(dropped_file)
+
 
 class WorkflowWizardDialog(QDialog):
-    def __init__(self, iface, base_config, parent=None):
+    def __init__(self, iface, base_config):
         QDialog.__init__(self)
         self.iface = iface
         self.base_config = base_config
@@ -451,3 +469,11 @@ def __init__(self, iface, base_config, parent=None):
         splitter.addWidget(self.log_panel)
         layout.addWidget(splitter)
         self.setLayout(layout)
+
+    def append_dropped_files(self, dropped_files):
+        """
+        Appends the files, restarts the wizard and jumps to the next page (what is ImportSourceSelection)
+        """
+        self.workflow_wizard.append_dropped_files(dropped_files)
+        self.workflow_wizard.restart()
+        self.workflow_wizard.next()

QgisModelBaker/qgismodelbaker.py

@@ -456,20 +456,18 @@ def create_project(
         qgis_project = QgsProject.instance()
         project.create(None, qgis_project)
 
-    def handle_dropped_file(self, file_path):
-        if pathlib.Path(file_path).suffix[1:] in ["xtf", "XTF", "itf", "ITF"]:
-            if not self.importdata_dlg:
-                self.set_dropped_file_configuration(file_path)
-                self.show_importdata_dialog()
-            return True
-        return False
-
-    def set_dropped_file_configuration(self, file_path):
+    def handle_dropped_files(self, dropped_files):
+        if not self.workflow_wizard_dlg:
+            self._set_dropped_file_configuration()
+            self.show_workflow_wizard_dialog()
+        self.workflow_wizard_dlg.append_dropped_files(dropped_files)
+        return True
+
+    def _set_dropped_file_configuration(self):
         settings = QSettings()
-        settings.setValue("QgisModelBaker/ili2pg/xtffile_import", file_path)
         settings.setValue("QgisModelBaker/importtype", "gpkg")
-        output_file_name = "{}_{:%Y%m%d%H%M%S%f}.gpkg".format(
-            os.path.splitext(os.path.basename(file_path))[0], datetime.datetime.now()
+        output_file_name = "temp_db_{:%Y%m%d%H%M%S%f}.gpkg".format(
+            datetime.datetime.now()
         )
         settings.setValue(
             "QgisModelBaker/ili2gpkg/dbfile",
@@ -485,28 +483,29 @@ def __init__(self, parent=None):
         super(DropFileFilter, self).__init__(parent.iface.mainWindow())
         self.parent = parent
 
-    def is_handling_requested(self, file_path):
-        if pathlib.Path(file_path).suffix[1:] in ["xtf", "XTF", "itf", "ITF"]:
-            settings = QSettings()
-            drop_mode = DropMode[
-                settings.value("QgisModelBaker/drop_mode", DropMode.ASK.name, str)
-            ]
-            if drop_mode == DropMode.ASK:
-                drop_message_dialog = DropMessageDialog(os.path.basename(file_path))
-                return drop_message_dialog.exec_()
-            return drop_mode == DropMode.YES
-        return False
+    def _is_handling_requested(self, dropped_files):
+        settings = QSettings()
+        drop_mode = DropMode[
+            settings.value("QgisModelBaker/drop_mode", DropMode.ASK.name, str)
+        ]
+        if drop_mode == DropMode.ASK:
+            drop_message_dialog = DropMessageDialog(dropped_files)
+            return drop_message_dialog.exec_()
+        return drop_mode == DropMode.YES
 
     def eventFilter(self, obj, event):
         """
-        When exactly one valid import file is dropped, then ask to use it in import dialog.
+        When files are dropped, then ask to use it in the model baker.
         """
         if event.type() == QEvent.Drop:
-            if len(event.mimeData().urls()) == 1:
-                if self.is_handling_requested(event.mimeData().urls()[0].toLocalFile()):
-                    if self.parent.handle_dropped_file(
-                        event.mimeData().urls()[0].toLocalFile()
-                    ):
+            dropped_files = [
+                url.toLocalFile()
+                for url in event.mimeData().urls()
+                if pathlib.Path(url.toLocalFile()).suffix[1:]
+                in ["xtf", "XTF", "itf", "ITF", "ili"]
+            ]
+            if dropped_files:
+                if self._is_handling_requested(dropped_files):
+                    if self.parent.handle_dropped_files(dropped_files):
                         return True
-
         return False

QgisModelBaker/ui/workflow_wizard/import_source_selection.ui

@@ -90,7 +90,7 @@
        <widget class="CompletionLineEdit" name="input_line_edit" native="true"/>
       </item>
       <item row="2" column="0" colspan="3">
-       <widget class="QListView" name="source_list_view"/>
+       <widget class="FileDropListView" name="source_list_view"/>
       </item>
       <item row="0" column="2">
        <widget class="QToolButton" name="file_browse_button">
@@ -114,6 +114,12 @@
    <header>QgisModelBaker.gui.options</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>FileDropListView</class>
+   <extends></extends>
+   <header>QgisModelBaker.gui.options</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>file_browse_button</tabstop>