- Add 'end' property correctly when using AddToTimeline dialog (for split clips)

- Large refactor to File Properties dialog (update related clips after changing file path or FPS, update form after switching files, scale start/end when changing FPS, group transactions for undo/redo, update thumbnails for all related clips and file)
- Adding Clips refactored to re-use File object data (instead of a fresh Clip Reader) - faster and more sane. Refactor thumbnail updating. Also, respect 'start' and 'end' properties of File object.

Author: jonoomph

src/classes/thumbnail.py

@@ -30,6 +30,7 @@
 import openshot
 import socket
 import time
+from requests import get
 from threading import Thread
 from classes import info
 from classes.query import File
@@ -47,6 +48,30 @@
 REGEX_THUMBNAIL_URL = re.compile(r"/thumbnails/(?P<file_id>.+?)/(?P<file_frame>\d+)/*(?P<only_path>path)?/*(?P<no_cache>no-cache)?")
 
 
+def GetThumbPath(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 GenerateThumbnail(file_path, thumb_path, thumbnail_frame, width, height, mask, overlay):
     """Create thumbnail image, and check for rotate metadata (if any)"""
 

src/windows/add_to_timeline.py

@@ -217,6 +217,8 @@ def accept(self):
             if file.data["media_type"] == "image":
                 end_time = image_length
                 new_clip["end"] = end_time
+            else:
+                new_clip["end"] = end_time
 
             # Adjust Fade of Clips (if no transition is chosen)
             if not transition_path:

src/windows/file_properties.py

@@ -35,11 +35,13 @@
 # Python module for libopenshot (required video editing module installed separately)
 import openshot
 
+from uuid import uuid4
 from classes import info, ui_util
 from classes.app import get_app
 from classes.image_types import get_media_type
 from classes.logger import log
 from classes.metrics import track_metric_screen
+from classes.query import Clip
 
 
 class FileProperties(QDialog):
@@ -78,6 +80,16 @@ def __init__(self, file):
         # Dynamically load tabs from settings data
         self.settings_data = self.s.get_all_settings()
 
+        # Initialize Form
+        self.channel_layout_choices = []
+        self.initialize()
+
+    def initialize(self):
+        """Init all form elements / textboxes / etc..."""
+        # get translations
+        app = get_app()
+        _ = app._tr
+
         # Get file properties
         filename = os.path.basename(self.file.data["path"])
         file_extension = os.path.splitext(filename)[1]
@@ -119,7 +131,7 @@ def __init__(self, file):
         self.txtAudioBitRate.setValue(int(self.file.data["audio_bit_rate"]))
 
         # Populate output field
-        self.txtOutput.setText(json.dumps(file.data, sort_keys=True, indent=2))
+        self.txtOutput.setText(json.dumps(self.file.data, sort_keys=True, indent=2))
 
         # Add channel layouts
         selected_channel_layout_index = 0
@@ -213,6 +225,9 @@ def browsePath(self):
             # verify path is valid (and prompt for image sequence if detected)
             self.verifyPath(new_path)
 
+            # re-init form
+            self.initialize()
+
     def accept(self):
         new_path = self.txtFilePath.text()
         if new_path and self.file.data.get("path") != new_path:
@@ -222,23 +237,57 @@ def accept(self):
         # Update file details
         self.file.data["name"] = self.txtFileName.text()
         self.file.data["tags"] = self.txtTags.text()
-
-        # Update Framerate
-        self.file.data["fps"]["num"] = self.txtFrameRateNum.value()
-        self.file.data["fps"]["den"] = self.txtFrameRateDen.value()
-
-        # Update start / end frame
-        fps_float = float(self.file.data["fps"]["num"]) / float(self.file.data["fps"]["den"])
-        if self.txtStartFrame.value() != 1 or self.txtEndFrame.value() != int(self.file.data["video_length"]):
+        
+        # Determine if FPS changed
+        fps_float = self.txtFrameRateNum.value() / self.txtFrameRateDen.value()
+        if self.file.data["fps"]["num"] != self.txtFrameRateNum.value() or \
+                self.file.data["fps"]["den"] != self.txtFrameRateDen.value():
+            original_fps_float = float(self.file.data["fps"]["num"]) / float(self.file.data["fps"]["den"])
+            # Update file 'fps' and 'video_timebase'
+            self.file.data["fps"]["num"] = self.txtFrameRateNum.value()
+            self.file.data["fps"]["den"] = self.txtFrameRateDen.value()
+            self.file.data["video_timebase"]["num"] = self.txtFrameRateDen.value()
+            self.file.data["video_timebase"]["den"] = self.txtFrameRateNum.value()
+
+            # Scale 'start' and 'end' properties by FPS difference
+            fps_diff = original_fps_float / fps_float
+            self.file.data["duration"] *= fps_diff
+            if "start" in self.file.data:
+                self.file.data["start"] *= fps_diff
+            if "end" in self.file.data:
+                self.file.data["end"] *= fps_diff
+
+        # Scale 'start' and 'end' file attributes (if changed)
+        elif self.txtStartFrame.value() != 1 or self.txtEndFrame.value() != int(self.file.data["video_length"]):
+            # Scale 'start' and 'end' properties by FPS difference
             self.file.data["start"] = (self.txtStartFrame.value() - 1) / fps_float
             self.file.data["end"] = (self.txtEndFrame.value() - 1) / fps_float
 
+        # Transaction id to group all updates together
+        tid = str(uuid4())
+        get_app().updates.transaction_id = tid
+
         # Save file object
         self.file.save()
 
         # Update file info & thumbnail
         get_app().window.FileUpdated.emit(self.file.id)
 
+        # Update related clips
+        for clip in Clip.filter(file_id=self.file.id):
+            clip.data["reader"] = self.file.data
+            clip.data["duration"] = self.file.data["duration"]
+            if clip.data["end"] > clip.data["duration"]:
+                clip.data["end"] = clip.data["duration"]
+            clip.save()
+
+            # Emit thumbnail update signal (to update timeline thumb image)
+            thumbnail_frame = (clip.data["start"] * fps_float) + 1
+            get_app().window.ThumbnailUpdated.emit(clip.id, thumbnail_frame)
+
+        # Done grouping transactions
+        get_app().updates.transaction_id = None
+
         # Accept dialog
         super(FileProperties, self).accept()
 

src/windows/main_window.py

@@ -106,7 +106,7 @@ class MainWindow(updates.UpdateWatcher, QMainWindow):
     MaxSizeChanged = pyqtSignal(object)
     InsertKeyframe = pyqtSignal(object)
     OpenProjectSignal = pyqtSignal(str)
-    ThumbnailUpdated = pyqtSignal(str)
+    ThumbnailUpdated = pyqtSignal(str, int)
     FileUpdated = pyqtSignal(str)
     CaptionTextUpdated = pyqtSignal(str, object)
     CaptionTextLoaded = pyqtSignal(str, object)
@@ -2162,18 +2162,6 @@ def actionFile_Properties_trigger(self):
         # Run the dialog event loop - blocking interaction on this window during that time
         result = win.exec_()
         if result == QDialog.Accepted:
-
-            # BRUTE FORCE approach: go through all clips and update file data
-            clips = Clip.filter(file_id=f.id)
-            for c in clips:
-                # update clip
-                c.data["reader"] = f.data
-                c.data["duration"] = f.data["duration"]
-                c.save()
-
-                # Emit thumbnail update signal (to update timeline thumb image)
-                self.ThumbnailUpdated.emit(c.id)
-
             log.info('File Properties Finished')
         else:
             log.info('File Properties Cancelled')

src/windows/models/files_model.py

@@ -45,7 +45,7 @@
 from classes.query import File
 from classes.logger import log
 from classes.app import get_app
-from requests import get
+from classes.thumbnail import GetThumbPath
 
 import openshot
 
@@ -203,7 +203,7 @@ def update_model(self, clear=True, delete_file_id=None, update_file_id=None):
                     thumbnail_frame = round(float(file.data['start']) * fps_float) + 1
 
                 # Get thumb path
-                thumb_icon = QIcon(self.get_thumb_path(file.id, thumbnail_frame))
+                thumb_icon = QIcon(GetThumbPath(file.id, thumbnail_frame))
             else:
                 # Audio file
                 thumb_icon = QIcon(os.path.join(info.PATH, "images", "AudioThumbnail.svg"))
@@ -314,17 +314,13 @@ def add_files(self, files, image_seq_details=None, quiet=False,
                 if seq_info:
                     # Update file with image sequence path & name
                     new_path = seq_info.get("path")
-                    new_file.data["name"] = os.path.basename(new_path)
 
                     # Load image sequence (to determine duration and video_length)
                     clip = openshot.Clip(new_path)
+                    new_file.data = json.loads(clip.Reader().Json())
                     if clip and clip.info.duration > 0.0:
-
                         # Update file details
-                        new_file.data["path"] = new_path
                         new_file.data["media_type"] = "video"
-                        new_file.data["duration"] = clip.Reader().info.duration
-                        new_file.data["video_length"] = "%s" % clip.Reader().info.video_length
 
                         if seq_info and "fps" in seq_info:
                             # Blender Titles specify their fps in seq_info
@@ -489,30 +485,6 @@ def process_urls(self, qurl_list):
         log.debug("Importing file list: {}".format(media_paths))
         self.add_files(media_paths, quiet=import_quietly)
 
-    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)
@@ -540,7 +512,7 @@ def update_file_thumbnail(self, file_id):
                     thumbnail_frame = round(float(file.data['start']) * fps_float) + 1
 
                 # Get thumb path
-                thumb_icon = QIcon(self.get_thumb_path(file.id, thumbnail_frame, clear_cache=True))
+                thumb_icon = QIcon(GetThumbPath(file.id, thumbnail_frame, clear_cache=True))
             else:
                 # Audio file
                 thumb_icon = QIcon(os.path.join(info.PATH, "images", "AudioThumbnail.svg"))

src/windows/views/webview.py

@@ -47,6 +47,8 @@
 from classes.query import File, Clip, Transition, Track
 from classes.waveform import get_audio_data
 from classes.effect_init import effect_options
+from classes.thumbnail import GetThumbPath
+
 
 # Constants used by this file
 JS_SCOPE_SELECTOR = "$('body').scope()"
@@ -1105,10 +1107,15 @@ def clipAudioDataReady_Triggered(self, clip_id, ui_data, tid):
         # Clear transaction id
         get_app().updates.transaction_id = None
 
-    def Thumbnail_Updated(self, clip_id):
+    def Thumbnail_Updated(self, clip_id, thumbnail_frame=1):
         """Callback when thumbnail needs to be updated"""
-        # Pass to javascript timeline (and render)
-        self.run_js(JS_SCOPE_SELECTOR + ".updateThumbnail('" + clip_id + "');")
+        clips = Clip.filter(id=clip_id)
+        for clip in clips:
+            # Force thumbnail image to be refreshed (for a particular frame #)
+            GetThumbPath(clip.data.get("file_id"), thumbnail_frame, clear_cache=True)
+
+            # Pass to javascript timeline (and render)
+            self.run_js(JS_SCOPE_SELECTOR + ".updateThumbnail('" + clip_id + "');")
 
     def Split_Audio_Triggered(self, action, clip_ids):
         """Callback for split audio context menus"""
@@ -2995,6 +3002,8 @@ def callback(self, data, callback_data):
                 new_clip["start"] = file.data['start']
             if 'end' in file.data:
                 new_clip["end"] = file.data['end']
+            else:
+                new_clip["end"] = new_clip["reader"]["duration"]
 
             # Set position and closet track
             new_clip["position"] = js_position