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

Spawn metadata IO in greenlets

Browse source
This commit is contained in:
Joel Collins 2020-07-01 15:58:18 +01:00
parent d9fd00b255
commit 78d0345239
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openflexure_microscope/microscope.py
View file

@ -360,6 +360,10 @@ class Microscope:
if not tags: if not tags:
tags = [] tags = []
# Read metadata for capture
full_metadata = {"instrument": self.get_metadata(cache_key), **metadata}
# Do capture
with self.camera.lock: with self.camera.lock:
# Create output object # Create output object
output = self.captures.new_image( output = self.captures.new_image(
@ -376,14 +380,7 @@ class Microscope:
fmt=fmt, fmt=fmt,
) )
# Gether metadata from hardware in a greenlet
logging.debug(f"Waiting for {output.file}")
# Wait for the file to be written to disk
output.file_ready.wait()
full_metadata = {"instrument": self.get_metadata(cache_key), **metadata}
output.put_and_save(tags, annotations, full_metadata) output.put_and_save(tags, annotations, full_metadata)
logging.debug(f"Finished adding EXIF data to {output.file}")
logging.debug(f"Finished capture to {output.file}") logging.debug(f"Finished capture to {output.file}")
return output return output