From d38109453cea17a31c335837c0029ad51fa3dda1 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sun, 23 Jul 2017 17:14:21 -0400
Subject: better component error messages

fatal errors cancel the export instead of crashing
---
 src/toolkit/common.py | 8 ++++++++
 src/toolkit/ffmpeg.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/toolkit')

diff --git a/src/toolkit/common.py b/src/toolkit/common.py
index 5fe601f..251a2c1 100644
--- a/src/toolkit/common.py
+++ b/src/toolkit/common.py
@@ -107,3 +107,11 @@ def rgbFromString(string):
         return tup
     except:
         return (255, 255, 255)
+
+
+def formatTraceback(tb=None):
+    import traceback
+    if tb is None:
+        import sys
+        tb = sys.exc_info()[2]
+    return 'Traceback:\n%s' % "\n".join(traceback.format_tb(tb))
diff --git a/src/toolkit/ffmpeg.py b/src/toolkit/ffmpeg.py
index 30dc0b3..8f5ae87 100644
--- a/src/toolkit/ffmpeg.py
+++ b/src/toolkit/ffmpeg.py
@@ -103,7 +103,7 @@ def createFfmpegCommand(inputFile, outputFile, components, duration=-1):
     globalFilters = 0  # increase to add global filters
     extraAudio = [
         comp.audio for comp in components
-        if 'audio' in comp.properties
+        if 'audio' in comp.properties()
     ]
     if extraAudio or globalFilters > 0:
         # Add -i options for extra input files
-- 
cgit v1.2.3