Convert files to use new proxy class, and a global shared model. No longer delete the tree/list view widgets either. They both always exist, and share the same data, and toggle visibility back and forth. Added wait cursor when adding/importing files.

Author: jonoomph

src/windows/main_window.py

@@ -53,6 +53,7 @@
 from classes.conversion import zoomToSeconds, secondsToZoom
 from classes.thumbnail import httpThumbnailServerThread
 from images import openshot_rc
+from windows.models.files_model import FilesModel
 from windows.views.files_treeview import FilesTreeView
 from windows.views.files_listview import FilesListView
 from windows.models.transition_model import TransitionsModel
@@ -81,6 +82,7 @@ class MainWindow(QMainWindow, updates.UpdateWatcher):
 
     previewFrameSignal = pyqtSignal(int)
     refreshFrameSignal = pyqtSignal()
+    refreshFilesSignal = pyqtSignal()
     LoadFileSignal = pyqtSignal(str)
     PlaySignal = pyqtSignal(int)
     PauseSignal = pyqtSignal()
@@ -350,7 +352,8 @@ def actionNew_trigger(self, event):
         # Reset selections
         self.clearSelections()
 
-        self.filesTreeView.refresh_view()
+        # Refresh files views
+        self.refreshFilesSignal.emit()
         log.info("New Project created.")
 
         # Set Window title
@@ -412,8 +415,8 @@ def actionEditTitle_trigger(self, event):
         # Run the dialog event loop - blocking interaction on this window during that time
         result = win.exec_()
 
-        # Force update of files model (which will rebuild missing thumbnails)
-        get_app().window.filesTreeView.refresh_view()
+        # Refresh files views
+        self.refreshFilesSignal.emit()
 
         # Force update of clips
         clips = Clip.filter(file_id=selected_file_id)
@@ -530,8 +533,8 @@ def open_project(self, file_path, clear_thumbnails=True):
                 # Reset selections
                 self.clearSelections()
 
-                # Refresh file tree
-                QTimer.singleShot(0, self.filesTreeView.refresh_view)
+                # Refresh files views
+                self.refreshFilesSignal.emit()
 
                 # Load recent projects again
                 self.load_recent_menu()
@@ -701,12 +704,21 @@ def actionImportFiles_trigger(self, event):
         if not recommended_path or not os.path.exists(recommended_path):
             recommended_path = os.path.join(info.HOME_PATH)
         files = QFileDialog.getOpenFileNames(self, _("Import File..."), recommended_path)[0]
+
+        # Set cursor to waiting
+        get_app().setOverrideCursor(QCursor(Qt.WaitCursor))
+
         for file_path in files:
             self.filesTreeView.add_file(file_path)
-            self.filesTreeView.refresh_view()
             app.updates.update_untracked(["import_path"], os.path.dirname(file_path))
             log.info("Imported media file {}".format(file_path))
 
+        # Restore cursor
+        get_app().restoreOverrideCursor()
+
+        # Refresh files views
+        self.refreshFilesSignal.emit()
+
     def actionAdd_to_Timeline_trigger(self, event):
         # Loop through selected files
         f = None
@@ -730,17 +742,6 @@ def actionAdd_to_Timeline_trigger(self, event):
         else:
             log.info('canceled')
 
-    def actionUploadVideo_trigger(self, event):
-        # show window
-        from windows.upload_video import UploadVideo
-        win = UploadVideo()
-        # Run the dialog event loop - blocking interaction on this window during this time
-        result = win.exec_()
-        if result == QDialog.Accepted:
-            log.info('Upload Video add confirmed')
-        else:
-            log.info('Upload Video add cancelled')
-
     def actionExportVideo_trigger(self, event):
         # show window
         from windows.export import Export
@@ -809,16 +810,16 @@ def actionPreferences_trigger(self, event):
         get_app().restoreOverrideCursor()
 
     def actionFilesShowAll_trigger(self, event):
-        self.filesTreeView.refresh_view()
+        self.refreshFilesSignal.emit()
 
     def actionFilesShowVideo_trigger(self, event):
-        self.filesTreeView.refresh_view()
+        self.refreshFilesSignal.emit()
 
     def actionFilesShowAudio_trigger(self, event):
-        self.filesTreeView.refresh_view()
+        self.refreshFilesSignal.emit()
 
     def actionFilesShowImage_trigger(self, event):
-        self.filesTreeView.refresh_view()
+        self.refreshFilesSignal.emit()
 
     def actionTransitionsShowAll_trigger(self, event):
         self.transitionsTreeView.refresh_view()
@@ -1823,18 +1824,12 @@ def actionDetailsView_trigger(self, event):
         app = get_app()
         s = settings.get_settings()
 
-        # Prepare treeview for deletion
-        if self.filesTreeView:
-            self.filesTreeView.prepare_for_delete()
-
         # Files
         if app.context_menu_object == "files":
             s.set("file_view", "details")
-            self.tabFiles.layout().removeWidget(self.filesTreeView)
-            self.filesTreeView.deleteLater()
-            self.filesTreeView = None
-            self.filesTreeView = FilesTreeView(self)
-            self.tabFiles.layout().addWidget(self.filesTreeView)
+            self.filesListView.hide()
+            self.filesTreeView.show()
+            self.filesTreeView.clearSelection()
 
         # Transitions
         elif app.context_menu_object == "transitions":
@@ -1861,18 +1856,12 @@ def actionThumbnailView_trigger(self, event):
         app = get_app()
         s = settings.get_settings()
 
-        # Prepare treeview for deletion
-        if self.filesTreeView:
-            self.filesTreeView.prepare_for_delete()
-
         # Files
         if app.context_menu_object == "files":
             s.set("file_view", "thumbnail")
-            self.tabFiles.layout().removeWidget(self.filesTreeView)
-            self.filesTreeView.deleteLater()
-            self.filesTreeView = None
-            self.filesTreeView = FilesListView(self)
-            self.tabFiles.layout().addWidget(self.filesTreeView)
+            self.filesListView.show()
+            self.filesListView.clearSelection()
+            self.filesTreeView.hide()
 
         # Transitions
         elif app.context_menu_object == "transitions":
@@ -2205,7 +2194,7 @@ def setup_toolbars(self):
         self.filesFilter.setPlaceholderText(_("Filter"))
         self.filesFilter.setClearButtonEnabled(True)
         self.filesToolbar.addWidget(self.filesFilter)
-        self.tabFiles.layout().addWidget(self.filesToolbar)
+        self.tabFiles.layout().insertWidget(0, self.filesToolbar)
 
         # Add transitions toolbar
         self.transitionsToolbar = QToolBar("Transitions Toolbar")
@@ -2544,13 +2533,20 @@ def __init__(self, mode=None):
         self.setCorner(Qt.TopRightCorner, Qt.RightDockWidgetArea)
         self.setCorner(Qt.BottomRightCorner, Qt.RightDockWidgetArea)
 
-        # Setup files tree
+        # Setup files tree and list view (both share a model)
+        self.files_model = FilesModel()
+        self.filesTreeView = FilesTreeView(self.files_model)
+        self.filesListView = FilesListView(self.files_model)
+        self.tabFiles.layout().insertWidget(-1, self.filesTreeView)
+        self.tabFiles.layout().insertWidget(-1, self.filesListView)
         if s.get("file_view") == "details":
-            self.filesTreeView = FilesTreeView(self)
+            self.filesTreeView.show()
+            self.filesListView.hide()
+            self.filesTreeView.setFocus()
         else:
-            self.filesTreeView = FilesListView(self)
-        self.tabFiles.layout().addWidget(self.filesTreeView)
-        self.filesTreeView.setFocus()
+            self.filesTreeView.hide()
+            self.filesListView.show()
+            self.filesListView.setFocus()
 
         # Setup transitions tree
         self.transition_model = TransitionsModel()

src/windows/models/files_model.py

@@ -28,7 +28,7 @@
 
 import os
 
-from PyQt5.QtCore import QMimeData, Qt, pyqtSignal
+from PyQt5.QtCore import QMimeData, Qt, pyqtSignal, QSortFilterProxyModel, QEventLoop
 from PyQt5.QtGui import *
 from PyQt5.QtWidgets import QMessageBox
 import openshot  # Python module for libopenshot (required video editing module installed separately)
@@ -64,28 +64,82 @@ def mimeData(self, indexes):
         return data
 
 
+class FileFilterProxyModel(QSortFilterProxyModel):
+    """Proxy class used for sorting and filtering model data"""
+
+    def filterAcceptsRow(self, sourceRow, sourceParent):
+        """Filter for text"""
+
+        if get_app().window.actionFilesShowVideo.isChecked() \
+                or get_app().window.actionFilesShowAudio.isChecked() \
+                or get_app().window.actionFilesShowImage.isChecked() \
+                or get_app().window.filesFilter.text():
+            # Fetch the file name
+            index = self.sourceModel().index(sourceRow, 0, sourceParent)
+            file_name = self.sourceModel().data(index) # file name (i.e. MyVideo.mp4)
+
+            # Fetch the media_type
+            index = self.sourceModel().index(sourceRow, 3, sourceParent)
+            media_type = self.sourceModel().data(index) # media type (i.e. video, image, audio)
+
+            index = self.sourceModel().index(sourceRow, 2, sourceParent)
+            tags = self.sourceModel().data(index) # tags (i.e. intro, custom, etc...)
+
+            if get_app().window.actionFilesShowVideo.isChecked():
+                if not media_type == "video":
+                    return False
+            elif get_app().window.actionFilesShowAudio.isChecked():
+                if not media_type == "audio":
+                    return False
+            elif get_app().window.actionFilesShowImage.isChecked():
+                if not media_type == "image":
+                    return False
+
+            # Match against regex pattern
+            return self.filterRegExp().indexIn(file_name) >= 0 or self.filterRegExp().indexIn(tags) >= 0
+
+        # Continue running built-in parent filter logic
+        return super(FileFilterProxyModel, self).filterAcceptsRow(sourceRow, sourceParent)
+
+
 class FilesModel(updates.UpdateInterface):
     # This method is invoked by the UpdateManager each time a change happens (i.e UpdateInterface)
     def changed(self, action):
 
         # Something was changed in the 'files' list
-        if len(action.key) >= 1 and action.key[0].lower() == "files":
+        if (len(action.key) >= 1 and action.key[0].lower() == "files") or action.type == "load":
             # Refresh project files model
             if action.type == "insert":
                 # Don't clear the existing items if only inserting new things
                 self.update_model(clear=False)
+            elif action.type == "delete" and action.key[0].lower() == "files":
+                # Don't clear the existing items if only deleting things
+                self.update_model(clear=False, delete_file_id=action.key[1].get('id', ''))
             else:
                 # Clear existing items
                 self.update_model(clear=True)
 
-    def update_model(self, clear=True):
+    def update_model(self, clear=True, delete_file_id=None):
         log.info("updating files model.")
         app = get_app()
 
         # Get window to check filters
         win = app.window
         _ = app._tr
 
+        # Delete a file (if delete_file_id passed in)
+        if delete_file_id in self.model_ids:
+            for row_num in range(self.model.rowCount()):
+                id_index = self.model.index(row_num, 5)
+                if delete_file_id == self.model.data(id_index):
+                    # Delete row from model
+                    self.model.beginRemoveRows(id_index.parent(), row_num, row_num)
+                    self.model.removeRow(row_num, id_index.parent())
+                    self.model.endRemoveRows()
+                    self.model.submit()
+                    self.model_ids.pop(delete_file_id)
+                    break
+
         # Skip updates (if needed)
         if self.ignore_update_signal:
             return
@@ -103,6 +157,10 @@ def update_model(self, clear=True):
 
         # add item for each file
         for file in files:
+            if file.data["id"] in self.model_ids:
+                # Ignore files that already exist in model
+                continue
+
             path, filename = os.path.split(file.data["path"])
             tags = ""
             if "tags" in file.data.keys():
@@ -111,24 +169,6 @@ def update_model(self, clear=True):
             if "name" in file.data.keys():
                 name = file.data["name"]
 
-            if not win.actionFilesShowAll.isChecked():
-                if win.actionFilesShowVideo.isChecked():
-                    if not file.data["media_type"] == "video":
-                        continue  # to next file, didn't match filter
-                elif win.actionFilesShowAudio.isChecked():
-                    if not file.data["media_type"] == "audio":
-                        continue  # to next file, didn't match filter
-                elif win.actionFilesShowImage.isChecked():
-                    if not file.data["media_type"] == "image":
-                        continue  # to next file, didn't match filter
-
-
-            if win.filesFilter.text() != "":
-                if not win.filesFilter.text().lower() in filename.lower() \
-                        and not win.filesFilter.text().lower() in tags.lower() \
-                        and not win.filesFilter.text().lower() in name.lower():
-                    continue
-
             # Generate thumbnail for file (if needed)
             if (file.data["media_type"] == "video" or file.data["media_type"] == "image"):
                 # Check for start and end attributes (optional)
@@ -201,10 +241,7 @@ def update_model(self, clear=True):
             if not file.data["id"] in self.model_ids:
                 self.model.appendRow(row)
                 self.model_ids[file.data["id"]] = file.data["id"]
-
-            # Process events in QT (to keep the interface responsive)
-            # TODO: FIX THIS
-            #app.processEvents()
+                get_app().processEvents(QEventLoop.ExcludeUserInputEvents)
 
             # Refresh view and filters (to hide or show this new item)
             get_app().window.resize_contents()

src/windows/views/effects_listview.py

@@ -104,7 +104,7 @@ def __init__(self, model):
         self.setTextElideMode(Qt.ElideRight)
         self.setStyleSheet('QListView::item { padding-top: 2px; }')
 
-        # Load initial emoji model data
+        # Load initial effects model data
         self.effects_model.update_model()
 
         # setup filter events

src/windows/views/effects_treeview.py

@@ -103,7 +103,7 @@ def __init__(self, model):
         self.setWordWrap(True)
         self.setStyleSheet('QTreeView::item { padding-top: 2px; }')
 
-        # Load initial emoji model data
+        # Load initial effects model data
         self.effects_model.update_model()
         self.hideColumn(3)
         self.hideColumn(4)