Add new signal for updating a file (such as editing a title), that results in the files_model updating the thumbnail, updating the name, and/or updating the tags.

Author: jonoomph

src/windows/main_window.py

@@ -101,6 +101,7 @@ class MainWindow(QMainWindow, updates.UpdateWatcher):
     InsertKeyframe = pyqtSignal(object)
     OpenProjectSignal = pyqtSignal(str)
     ThumbnailUpdated = pyqtSignal(str)
+    FileUpdated = pyqtSignal(str)
 
     # Docks are closable, movable and floatable
     docks_frozen = False
@@ -409,8 +410,8 @@ def actionEditTitle_trigger(self, event):
         # Run the dialog event loop - blocking interaction on this window during that time
         result = win.exec_()
 
-        # Refresh files views
-        self.refreshFilesSignal.emit()
+        # Update file thumbnail
+        self.FileUpdated.emit(selected_file_id)
 
         # Force update of clips
         clips = Clip.filter(file_id=selected_file_id)
@@ -422,6 +423,9 @@ def actionEditTitle_trigger(self, event):
             # Emit thumbnail update signal (to update timeline thumb image)
             self.ThumbnailUpdated.emit(c.id)
 
+        # Update preview
+        self.refreshFrameSignal.emit()
+
     def actionDuplicateTitle_trigger(self, event):
 
         file_path = None
@@ -538,6 +542,9 @@ def open_project(self, file_path, clear_thumbnails=True):
                 # Refresh files views
                 self.refreshFilesSignal.emit()
 
+                # Refresh thumbnail
+                self.refreshFrameSignal.emit()
+
                 # Load recent projects again
                 self.load_recent_menu()
 

src/windows/models/files_model.py

@@ -114,6 +114,9 @@ def changed(self, action):
             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', ''))
+            elif action.type == "update" and action.key[0].lower() == "files":
+                # Do nothing for file updates
+                pass
             else:
                 # Clear existing items
                 self.update_model(clear=True)
@@ -122,6 +125,8 @@ def update_model(self, clear=True, delete_file_id=None):
         log.info("updating files model.")
         app = get_app()
 
+        self.ignore_updates = True
+
         # Get window to check filters
         win = app.window
         _ = app._tr
@@ -139,10 +144,6 @@ def update_model(self, clear=True, delete_file_id=None):
                     self.model_ids.pop(delete_file_id)
                     break
 
-        # Skip updates (if needed)
-        if self.ignore_update_signal:
-            return
-
         # Clear all items
         if clear:
             self.model_ids = {}
@@ -178,16 +179,8 @@ def update_model(self, clear=True, delete_file_id=None):
                     fps_float = float(fps["num"]) / float(fps["den"])
                     thumbnail_frame = round(float(file.data['start']) * fps_float) + 1
 
-                # Determine thumb path (default value... a guess)
-                thumb_path = os.path.join(info.THUMBNAIL_PATH, "%s-%s.png" % (file.id, thumbnail_frame))
-
-                # Connect to thumbnail server and get image
-                thumb_server_details = get_app().window.http_server_thread.server_address
-                thumb_address = "http://%s:%s/thumbnails/%s/%s/path/" % (thumb_server_details[0], thumb_server_details[1], file.id, thumbnail_frame)
-                r = get(thumb_address)
-                if r.ok:
-                    # Update thumbnail path to real one
-                    thumb_path = r.text
+                # Get thumb path
+                thumb_path = self.get_thumb_path(file.id, thumbnail_frame)
             else:
                 # Audio file
                 thumb_path = os.path.join(info.PATH, "images", "AudioThumbnail.png")
@@ -250,9 +243,56 @@ def update_model(self, clear=True, delete_file_id=None):
             # Refresh view and filters (to hide or show this new item)
             get_app().window.resize_contents()
 
+        self.ignore_updates = False
+
         # Emit signal when model is updated
         self.model.ModelRefreshed.emit()
 
+    def get_thumb_path(self, file_id, thumbnail_frame, clear_cache=False):
+        """Get thumbnail path by invoking HTTP thumbnail request"""
+
+        # Clear thumb cache (if requested)
+        thumb_cache = ""
+        if clear_cache:
+            thumb_cache = "no-cache/"
+
+        # Connect to thumbnail server and get image
+        thumb_server_details = get_app().window.http_server_thread.server_address
+        thumb_address = "http://%s:%s/thumbnails/%s/%s/path/%s" % (
+        thumb_server_details[0], thumb_server_details[1], file_id, thumbnail_frame, thumb_cache)
+        r = get(thumb_address)
+        if r.ok:
+            # Update thumbnail path to real one
+            return r.text
+        else:
+            return ''
+
+    def update_file_thumbnail(self, file_id):
+        """Update/re-generate the thumbnail of a specific file"""
+        file = File.get(id=file_id)
+        path, filename = os.path.split(file.data["path"])
+        name = filename
+        if "name" in file.data.keys():
+            name = file.data["name"]
+
+        # Refresh thumbnail for updated file
+        self.ignore_updates = True
+        if file_id in self.model_ids:
+            for row_num in range(self.model.rowCount()):
+                id_index = self.model.index(row_num, 5)
+                if file_id == self.model.data(id_index):
+                    # Update thumb for file
+                    thumb_index = self.model.index(row_num, 0)
+                    thumb_path = self.get_thumb_path(file_id, 1, clear_cache=True)
+                    item = self.model.itemFromIndex(thumb_index)
+                    item.setIcon(QIcon(thumb_path))
+                    item.setText(name)
+
+                    # Emit signal when model is updated
+                    self.model.ModelRefreshed.emit()
+                    break
+        self.ignore_updates = False
+
     def __init__(self, *args):
 
         # Add self as listener to project data updates (undo/redo, as well as normal actions handled within this class all update the tree model)
@@ -263,7 +303,7 @@ def __init__(self, *args):
         self.model = FileStandardItemModel()
         self.model.setColumnCount(6)
         self.model_ids = {}
-        self.ignore_update_signal = False
+        self.ignore_updates = False
 
         # Create proxy model (for sorting and filtering)
         self.proxy_model = FileFilterProxyModel()
@@ -272,3 +312,6 @@ def __init__(self, *args):
         self.proxy_model.setSortCaseSensitivity(Qt.CaseSensitive)
         self.proxy_model.setSourceModel(self.model)
         self.proxy_model.setSortLocaleAware(True)
+
+        # Connect signal
+        app.window.FileUpdated.connect(self.update_file_thumbnail)

src/windows/views/files_listview.py

@@ -312,13 +312,6 @@ def currentChanged(self, selected, deselected):
     def resize_contents(self):
         pass
 
-    def prepare_for_delete(self):
-        """Remove signal handlers and prepare for deletion"""
-        try:
-            self.files_model.model.ModelRefreshed.disconnect()
-        except Exception:
-            pass
-
     def __init__(self, model):
         # Invoke parent init
         QListView.__init__(self)
@@ -348,6 +341,7 @@ def __init__(self, model):
         self.setWordWrap(False)
         self.setTextElideMode(Qt.ElideRight)
         self.setStyleSheet('QListView::item { padding-top: 2px; }')
+        self.files_model.model.ModelRefreshed.connect(self.refresh_view)
 
         # Load initial files model data
         self.files_model.update_model()

src/windows/views/files_treeview.py

@@ -326,6 +326,9 @@ def currentChanged(self, selected, deselected):
 
     def value_updated(self, item):
         """ Name or tags updated """
+        if self.files_model.ignore_updates:
+            return
+
         # Get translation method
         _ = get_app()._tr
 
@@ -336,31 +339,22 @@ def value_updated(self, item):
 
         # Get file object and update friendly name and tags attribute
         f = File.get(id=file_id)
-        if name != f.data["path"]:
+        if name and name != os.path.split(f.data["path"])[-1]:
             f.data["name"] = name
         else:
-            f.data["name"] = ""
+            f.data["name"] = os.path.split(f.data["path"])[-1]
+
         if "tags" in f.data.keys():
             if tags != f.data["tags"]:
                 f.data["tags"] = tags
         elif tags:
             f.data["tags"] = tags
 
-        # Tell file model to ignore updates (since this treeview will already be updated)
-        self.files_model.ignore_update_signal = True
-
         # Save File
         f.save()
 
-        # Re-enable updates
-        self.files_model.ignore_update_signal = False
-
-    def prepare_for_delete(self):
-        """Remove signal handlers and prepare for deletion"""
-        try:
-            self.files_model.model.ModelRefreshed.disconnect()
-        except:
-            pass
+        # Update file thumbnail
+        self.win.FileUpdated.emit(file_id)
 
     def __init__(self, model):
         # Invoke parent init