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

Fixed missing capture validation

Browse source
This commit is contained in:
Joel Collins 2019-02-18 12:11:33 +00:00
parent ab70a3857c
commit e8fb3b378c
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
openflexure_microscope/camera/base.py
View file

@ -242,15 +242,6 @@ class BaseCamera(object):
with open(db_path, 'w') as outfile: with open(db_path, 'w') as outfile:
yaml.safe_dump(capture_state, outfile) yaml.safe_dump(capture_state, outfile)
def validate_captures(self, capture_list):
# Purge captures with missing data files
valid_captures = []
for capture in capture_list:
if capture.file_exists:
valid_captures.append(capture)
return valid_captures
def load_capture_db(self, db_path): def load_capture_db(self, db_path):
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
@ -258,9 +249,11 @@ class BaseCamera(object):
capture_dict_list = yaml.load(infile) capture_dict_list = yaml.load(infile)
# Create capture object list, and validate captures # Create capture object list, and validate captures
capture_list = self.validate_captures( capture_list = []
[capture_from_dict(capture_dict) for capture_dict in capture_dict_list]
) for capture_dict in capture_dict_list:
if os.path.isfile(capture_dict['path']):
capture_list.append(capture_from_dict(capture_dict))
return capture_list return capture_list