aboutsummaryrefslogtreecommitdiff
path: root/src/command.py
diff options
context:
space:
mode:
authorBrianna2017-09-02 09:49:35 -0400
committerGitHub2017-09-02 09:49:35 -0400
commit22978a0635e906f8ebfa1de81cdc38fd96aad756 (patch)
tree2dc5e033a4073d433aaa824113467032d35ca3c1 /src/command.py
parent39d6a4e5af94a8aa612a009bbe235715b84e7abc (diff)
parent8411857030d92e448d5c64682f396e677161afbe (diff)
Undo feature
Diffstat (limited to 'src/command.py')
-rw-r--r--src/command.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/command.py b/src/command.py
index 18f7408..cd3c6c3 100644
--- a/src/command.py
+++ b/src/command.py
@@ -8,6 +8,7 @@ import argparse
import os
import sys
import time
+import signal
from core import Core
@@ -19,6 +20,7 @@ class Command(QtCore.QObject):
def __init__(self):
QtCore.QObject.__init__(self)
self.core = Core()
+ Core.mode = 'commandline'
self.dataDir = self.core.dataDir
self.canceled = False
@@ -90,6 +92,9 @@ class Command(QtCore.QObject):
for arg in args:
self.core.selectedComponents[i].command(arg)
+ # ctrl-c stops the export thread
+ signal.signal(signal.SIGINT, self.stopVideo)
+
if self.args.export and self.args.projpath:
errcode, data = self.core.parseAvFile(projPath)
for key, value in data['WindowFields']:
@@ -123,6 +128,11 @@ class Command(QtCore.QObject):
self.worker.progressBarSetText.connect(self.progressBarSetText)
self.createVideo.emit()
+ def stopVideo(self, *args):
+ self.worker.error = True
+ self.worker.cancelExport()
+ self.worker.cancel()
+
@QtCore.pyqtSlot(str)
def progressBarSetText(self, value):
if 'Export ' in value: