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

Changed error handling

Browse Source
This commit is contained in:
Balthasar Reuter
2015-05-30 22:34:57 +02:00
parent 71b8f044aa
commit 08370aea00
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
photobooth.py
View File

@@ -267,16 +267,24 @@ class Camera:
def call_gphoto(self, action, filename): def call_gphoto(self, action, filename):
# Try to run the command # Try to run the command
try: try:
output = subprocess.check_output("gphoto2 --force-overwrite --quiet " cmd = "gphoto2 --force-overwrite --quiet " + action + " --filename " + filename
+ action + " --filename " + filename, output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
shell=True, stderr=subprocess.STDOUT) if "ERROR" in output:
raise subprocess.CalledProcessError(returncod=0, cmd=cmd, output=output)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise CameraException("Can't call gphoto2!") if "Canon EOS Capture failed: 2019" in e.output:
# Handle non-fatal errors raise CameraException("Can't focus! Move and try again!")
if "Canon EOS Capture failed: 2019" in output: elif "Could not detect any camera" in e.output:
raise CameraException("Can't focus! Move and try again!") raise CameraException("No (supported) camera detected!")
elif "ERROR" in output: else:
raise CameraException("Unknown error:\n" + output) raise CameraException("Unknown error!\n" + '\n'.join(e.output.split('\n')[1:3]))
# # Handle non-fatal errors
# if "Canon EOS Capture failed: 2019" in output:
# raise CameraException("Can't focus! Move and try again!")
# elif "Could not detect any camera" in output:
# raise CameraException("No (supported) camera detected!")
# elif "ERROR" in output:
# raise CameraException("Unknown error:\n" + output)
# Return the command line output # Return the command line output
return output return output