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

Minor changes in error handling

Browse Source
This commit is contained in:
Balthasar Reuter
2015-05-30 23:36:01 +02:00
parent a96966f149
commit d91a40d718
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
photobooth.py
View File

@@ -274,18 +274,10 @@ class Camera:
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if "Canon EOS Capture failed: 2019" in e.output: if "Canon EOS Capture failed: 2019" in e.output:
raise CameraException("Can't focus! Move and try again!") raise CameraException("Can't focus! Move and try again!")
elif "Could not detect any camera" in e.output: elif "No camera found" in e.output:
raise CameraException("No (supported) camera detected!") raise CameraException("No (supported) camera detected!")
else: else:
raise CameraException("Unknown error!\n" + '\n'.join(e.output.split('\n')[1:3])) 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 output return output
def preview(self, filename="/tmp/preview.jpg"): def preview(self, filename="/tmp/preview.jpg"):