Merge branch 'develop' into color-allover

Author: jonoomph

src/classes/exceptions.py

@@ -25,17 +25,117 @@
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """
 
+import os
 import traceback
+import platform
+
+from classes import info
 from classes.logger import log
-from classes.metrics import track_exception_stacktrace
+from classes.metrics import track_exception_stacktrace, track_metric_error
 
 
 def ExceptionHandler(exeception_type, exeception_value, exeception_traceback):
     """Callback for any unhandled exceptions"""
-    log.error('Unhandled Exception', exc_info=(exeception_type, exeception_value, exeception_traceback))
+    log.error(
+        'Unhandled Exception',
+        exc_info=(exeception_type, exeception_value, exeception_traceback))
 
     # Build string of stack trace
-    stacktrace = "Python %s" % "".join(traceback.format_exception(exeception_type, exeception_value, exeception_traceback))
+    stacktrace = "Python %s" % "".join(
+        traceback.format_exception(
+            exeception_type, exeception_value, exeception_traceback))
 
     # Report traceback to webservice (if enabled)
     track_exception_stacktrace(stacktrace, "openshot-qt")
+
+
+def tail_file(f, n, offset=None):
+    """Read the end of a file (n number of lines)"""
+    avg_line_length = 90
+    to_read = n + (offset or 0)
+
+    while True:
+        try:
+            # Seek to byte position
+            f.seek(-(avg_line_length * to_read), 2)
+        except IOError:
+            # Byte position not found
+            f.seek(0)
+        pos = f.tell()
+        lines = f.read().splitlines()
+        if len(lines) >= to_read or pos == 0:
+            # Return the lines
+            return lines[-to_read:offset and -offset or None]
+        avg_line_length *= 2
+
+
+def libopenshot_crash_recovery():
+    """Walk libopenshot.log for the last line before this launch"""
+    log_path = os.path.join(info.USER_PATH, "libopenshot.log")
+    last_log_line = ""
+    last_stack_trace = ""
+    found_stack = False
+    log_start_counter = 0
+    if not os.path.exists(log_path):
+        return
+    with open(log_path, "rb") as f:
+        # Read from bottom up
+        for raw_line in reversed(tail_file(f, 500)):
+            line = str(raw_line, 'utf-8')
+            # Detect stack trace
+            if "End of Stack Trace" in line:
+                found_stack = True
+                continue
+            if "Unhandled Exception: Stack Trace" in line:
+                found_stack = False
+                continue
+            if "libopenshot logging:" in line:
+                log_start_counter += 1
+                if log_start_counter > 1:
+                    # Found the previous log start, too old now
+                    break
+
+            if found_stack:
+                # Append line to beginning of stacktrace
+                last_stack_trace = line + last_stack_trace
+
+            # Ignore certain useless lines
+            line.strip()
+            if all(["---" not in line,
+                    "libopenshot logging:" not in line,
+                    not last_log_line,
+                    ]):
+                last_log_line = line
+
+    # Split last stack trace (if any)
+    if last_stack_trace:
+        # Get top line of stack trace (for metrics)
+        last_log_line = last_stack_trace.split("\n")[0].strip()
+
+        # Send stacktrace for debugging (if send metrics is enabled)
+        track_exception_stacktrace(last_stack_trace, "libopenshot")
+
+    # Clear / normalize log line (so we can roll them up in the analytics)
+    if last_log_line:
+        # Format last log line based on OS (since each OS can be formatted differently)
+        if platform.system() == "Darwin":
+            last_log_line = "mac-%s" % last_log_line[58:].strip()
+        elif platform.system() == "Windows":
+            last_log_line = "windows-%s" % last_log_line
+        elif platform.system() == "Linux":
+            last_log_line = "linux-%s" % last_log_line.replace("/usr/local/lib/", "")
+
+        # Remove '()' from line, and split. Trying to grab the beginning of the log line.
+        last_log_line = last_log_line.replace("()", "")
+        log_parts = last_log_line.split("(")
+        if len(log_parts) == 2:
+            last_log_line = "-%s" % log_parts[0].replace(
+                "logger_libopenshot:INFO ", "").strip()[:64]
+        elif len(log_parts) >= 3:
+            last_log_line = "-%s (%s" % (log_parts[0].replace(
+                "logger_libopenshot:INFO ", "").strip()[:64], log_parts[1])
+    else:
+        last_log_line = ""
+
+    # Report exception (with last libopenshot line... if found)
+    track_metric_error("unhandled-crash%s" % last_log_line, True)

src/classes/style_tools.py

@@ -0,0 +1,72 @@
+"""
+ @file
+ @brief Utility functions for manipulating SVG style attributes
+ @author FeRD (Frank Dana) <[email protected]>
+
+ @section LICENSE
+
+ Copyright (c) 2008-2020 OpenShot Studios, LLC
+ (http://www.openshotstudios.com). This file is part of
+ OpenShot Video Editor (http://www.openshot.org), an open-source project
+ dedicated to delivering high quality video editing and animation solutions
+ to the world.
+
+ OpenShot Video Editor is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenShot Video Editor 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 General Public License
+ along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from classes.logger import log
+
+
+def style_to_dict(style: str) -> dict:
+    """Explode an SVG node style= attribute string into a dict representation"""
+    styledict = {}
+    try:
+        # Fill the dict using key-value pairs produced by this comprehension
+        styledict.update(
+            # Make pairs of (property, value) by splitting on the first ':'
+            (a.split(':', 1))
+            # Using the list formed by splitting style on ';'
+            for a in style.split(';')
+            # Ignore any empty strings produced
+            if a
+            )
+        return styledict
+    except ValueError as ex:
+        log.error(
+            "style_to_dict failed to convert to dict: %s\n%s",
+            ex, style)
+
+
+def dict_to_style(styledict: dict) -> str:
+    """Turn an exploded style dictionary back into a string"""
+    # Glue the results of this comprehension together with ';' separators
+    try:
+        style = ";".join([
+            # Produce a list of "key:value" strings
+            ":".join([k, v])
+            # For every {key: value} in styledict
+            for k, v in styledict.items()
+            ])
+        # Don't forget the trailing semicolon!
+        return style + ';'
+    except ValueError as ex:
+        import json
+        log.error(
+            "style_to_dict failed to generate string: %s\n%s",
+            ex, json.dumps(styledict))
+
+
+def set_if_existing(d: dict, existing_key, new_value):
+    if existing_key in d:
+        d.update({existing_key: new_value})

src/windows/main_window.py

@@ -28,7 +28,6 @@
  """
 
 import os
-import platform
 import shutil
 import sys
 import webbrowser
@@ -50,18 +49,15 @@
     QLineEdit, QSlider, QLabel, QComboBox, QTextEdit
 )
 
-from classes import info, ui_util, settings, qt_types, updates
+from classes import exceptions, info, settings, qt_types, ui_util, updates
 from classes.app import get_app
 from classes.conversion import zoomToSeconds, secondsToZoom
 from classes.exporters.edl import export_edl
 from classes.exporters.final_cut_pro import export_xml
 from classes.importers.edl import import_edl
 from classes.importers.final_cut_pro import import_xml
 from classes.logger import log
-from classes.metrics import (
-    track_metric_session, track_metric_screen,
-    track_metric_error, track_exception_stacktrace,
-    )
+from classes.metrics import track_metric_session, track_metric_screen
 from classes.query import Clip, Transition, Marker, Track
 from classes.thumbnail import httpThumbnailServerThread
 from classes.time_parts import secondsToTimecode
@@ -214,101 +210,26 @@ def recover_backup(self):
     def create_lock_file(self):
         """Create a lock file"""
         lock_path = os.path.join(info.USER_PATH, ".lock")
-        lock_value = str(uuid4())
-
         # Check if it already exists
         if os.path.exists(lock_path):
-            # Walk the libopenshot log (if found), and try and find last line before this launch
-            log_path = os.path.join(info.USER_PATH, "libopenshot.log")
-            last_log_line = ""
-            last_stack_trace = ""
-            found_stack = False
-            log_start_counter = 0
-            if os.path.exists(log_path):
-                with open(log_path, "rb") as f:
-                    # Read from bottom up
-                    for raw_line in reversed(self.tail_file(f, 500)):
-                        line = str(raw_line, 'utf-8')
-                        # Detect stack trace
-                        if "End of Stack Trace" in line:
-                            found_stack = True
-                            continue
-                        if "Unhandled Exception: Stack Trace" in line:
-                            found_stack = False
-                            continue
-                        if "libopenshot logging:" in line:
-                            log_start_counter += 1
-                            if log_start_counter > 1:
-                                # Found the previous log start, too old now
-                                break
-
-                        if found_stack:
-                            # Append line to beginning of stacktrace
-                            last_stack_trace = line + last_stack_trace
-
-                        # Ignore certain useless lines
-                        line.strip()
-                        if all(["---" not in line,
-                                "libopenshot logging:" not in line,
-                                not last_log_line,
-                                ]):
-                            last_log_line = line
-
-            # Split last stack trace (if any)
-            if last_stack_trace:
-                # Get top line of stack trace (for metrics)
-                last_log_line = last_stack_trace.split("\n")[0].strip()
-
-                # Send stacktrace for debugging (if send metrics is enabled)
-                track_exception_stacktrace(last_stack_trace, "libopenshot")
-
-            # Clear / normalize log line (so we can roll them up in the analytics)
-            if last_log_line:
-                # Format last log line based on OS (since each OS can be formatted differently)
-                if platform.system() == "Darwin":
-                    last_log_line = "mac-%s" % last_log_line[58:].strip()
-                elif platform.system() == "Windows":
-                    last_log_line = "windows-%s" % last_log_line
-                elif platform.system() == "Linux":
-                    last_log_line = "linux-%s" % last_log_line.replace("/usr/local/lib/", "")
-
-                # Remove '()' from line, and split. Trying to grab the beginning of the log line.
-                last_log_line = last_log_line.replace("()", "")
-                log_parts = last_log_line.split("(")
-                if len(log_parts) == 2:
-                    last_log_line = "-%s" % log_parts[0].replace(
-                        "logger_libopenshot:INFO ", "").strip()[:64]
-                elif len(log_parts) >= 3:
-                    last_log_line = "-%s (%s" % (log_parts[0].replace(
-                        "logger_libopenshot:INFO ", "").strip()[:64], log_parts[1])
-            else:
-                last_log_line = ""
-
-            # Throw exception (with last libopenshot line... if found)
-            log.error(
-                "Unhandled crash detected... will attempt to recover backup project: %s"
-                % info.BACKUP_FILE)
-            track_metric_error("unhandled-crash%s" % last_log_line, True)
-
-            # Remove file
+            exceptions.libopenshot_crash_recovery()
+            log.error("Unhandled crash detected. Preserving cache.")
             self.destroy_lock_file()
-
         else:
             # Normal startup, clear thumbnails
             self.clear_all_thumbnails()
 
         # Write lock file (try a few times if failure)
+        lock_value = str(uuid4())
         for attempt in range(5):
             try:
                 # Create lock file
                 with open(lock_path, 'w') as f:
                     f.write(lock_value)
-                log.debug("Wrote value {} to lock file {}".format(
-                    lock_value, lock_path))
+                log.debug("Wrote value %s to lock file %s", lock_value, lock_path)
                 break
             except OSError:
-                log.debug('Failed to write lock file (attempt: {})'.format(
-                    attempt), exc_info=1)
+                log.debug("Failed to write lock file (attempt: %d)", attempt, exc_info=1)
                 sleep(0.25)
 
     def destroy_lock_file(self):
@@ -327,25 +248,6 @@ def destroy_lock_file(self):
                 log.debug('Failed to destroy lock file (attempt: %s)' % attempt, exc_info=1)
                 sleep(0.25)
 
-    def tail_file(self, f, n, offset=None):
-        """Read the end of a file (n number of lines)"""
-        avg_line_length = 90
-        to_read = n + (offset or 0)
-
-        while True:
-            try:
-                # Seek to byte position
-                f.seek(-(avg_line_length * to_read), 2)
-            except IOError:
-                # Byte position not found
-                f.seek(0)
-            pos = f.tell()
-            lines = f.read().splitlines()
-            if len(lines) >= to_read or pos == 0:
-                # Return the lines
-                return lines[-to_read:offset and -offset or None]
-            avg_line_length *= 2
-
     def actionNew_trigger(self):
 
         app = get_app()
@@ -413,14 +315,9 @@ def actionTitle_trigger(self):
         from windows.title_editor import TitleEditor
         win = TitleEditor()
         # Run the dialog event loop - blocking interaction on this window during that time
-        result = win.exec_()
-        if result == QDialog.Accepted:
-            log.info('title editor add confirmed')
-        else:
-            log.info('title editor add cancelled')
+        win.exec_()
 
     def actionEditTitle_trigger(self):
-
         # Loop through selected files (set 1 selected file if more than 1)
         for f in self.selected_files():
             if f.data.get("path").endswith(".svg"):
@@ -433,7 +330,7 @@ def actionEditTitle_trigger(self):
 
         # show dialog for editing title
         from windows.title_editor import TitleEditor
-        win = TitleEditor(file_path)
+        win = TitleEditor(edit_file_path=file_path)
         # Run the dialog event loop - blocking interaction on this window during that time
         win.exec_()
 
@@ -467,7 +364,7 @@ def actionDuplicateTitle_trigger(self):
 
         # show dialog for editing title
         from windows.title_editor import TitleEditor
-        win = TitleEditor(file_path, duplicate=True)
+        win = TitleEditor(edit_file_path=file_path, duplicate=True)
         # Run the dialog event loop - blocking interaction on this window during that time
         return win.exec_()