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

Fixed missing metadata keys

Browse source
This commit is contained in:
Joel Collins 2019-11-22 13:42:29 +00:00
parent cbed9b319e
commit ee3d2d90cc
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
openflexure_microscope/camera/capture.py
View file

@ -98,8 +98,12 @@ def capture_from_exif(path, exif_dict):
capture.timestring = exif_dict["time"] capture.timestring = exif_dict["time"]
capture.format = exif_dict["format"] capture.format = exif_dict["format"]
capture.custom_metadata = exif_dict["custom"] capture.custom_metadata = (
capture.system_metadata = exif_dict["system"] exif_dict["custom"] if "custom" in exif_dict.keys() else {}
)
capture.system_metadata = (
exif_dict["system"] if "system" in exif_dict.keys() else {}
)
capture.tags = exif_dict["tags"] capture.tags = exif_dict["tags"]
return capture return capture
@ -200,7 +204,7 @@ class CaptureObject(object):
# HANDLE METADATA # HANDLE METADATA
def put_metadata(self, data: dict, system: bool=False) -> None: def put_metadata(self, data: dict, system: bool = False) -> None:
""" """
Merge metadata from a passed dictionary into the capture metadata, and saves. Merge metadata from a passed dictionary into the capture metadata, and saves.
@ -245,7 +249,7 @@ class CaptureObject(object):
"format": self.format, "format": self.format,
"tags": self.tags, "tags": self.tags,
"custom": self.custom_metadata, "custom": self.custom_metadata,
"system": self.system_metadata "system": self.system_metadata,
} }
# Add custom metadata to dictionary # Add custom metadata to dictionary