felix/photobooth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed call to gphoto2

Browse Source
This commit is contained in:
Balthasar Reuter
2015-05-01 17:35:55 +02:00
parent 77734846e3
commit 450c900436
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
photobooth.py
View File

@@ -61,8 +61,11 @@ class Camera:
"""Camera class providing functionality to take pictures""" """Camera class providing functionality to take pictures"""
#def __init__(self): #def __init__(self):
def preview(self, filename="/tmp/preview.jpg"): def preview(self, filename="/tmp/preview.jpg"):
ret = subprocess.call("gphoto2 --force-overwrite --capture-preview --quiet --filename " + filename) try:
if ret != 0: error("Error during preview!", ret) output = subprocess.check_output("gphoto2 --force-overwrite --capture-preview --quiet --filename " + filename, shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
error("Error during preview when calling '" + e.cmd + "'!\nOutput: " + e.output, e.returncode)
if "ERROR" in output: error("Error during preview!\n" + output)
return filename return filename
@@ -75,7 +78,7 @@ def actions():
time.sleep(0.5) time.sleep(0.5)
def error(msg, exit_code=1): def error(msg, exit_code=1):
print "ERROR:" + msg print "ERROR: " + msg
teardown(exit_code) teardown(exit_code)
def teardown(exit_code=0): def teardown(exit_code=0):