rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Malformed capture db no longer crashes server

Browse source
This commit is contained in:
Joel Collins 2019-04-15 19:14:31 +01:00
parent b7ee18d081
commit 28561433a0
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
openflexure_microscope/camera/base.py
View file

@ -256,7 +256,12 @@ class BaseCamera(object):
if os.path.isfile(db_path): if os.path.isfile(db_path):
# Load list of capture dictionary representations from db_path # Load list of capture dictionary representations from db_path
with open(db_path, 'r') as infile: with open(db_path, 'r') as infile:
capture_dict_list = yaml.load(infile) try:
capture_dict_list = yaml.load(infile)
except yaml.scanner.ScannerError as e:
logging.error(e)
logging.warning('Emptying malformed database. Your captures will not be deleted, but may not appear in the gallery.')
capture_dict_list = []
# Create capture object list, and validate captures # Create capture object list, and validate captures
capture_list = [] capture_list = []