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

Added JSON safety to config reads

Browse source
This commit is contained in:
Joel Collins 2019-01-31 16:47:54 +00:00
parent 0fd0cd8bac
commit 04bed170a0
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/api/v1/blueprints/base.py
View file

@ -136,7 +136,7 @@ class ConfigAPI(MicroscopeView):
:>header Content-Type: application/json
:status 200: state available
"""
return jsonify(self.microscope.read_config())
return jsonify(self.microscope.read_config(json_safe=True))
def post(self):
"""
@ -175,7 +175,7 @@ class ConfigAPI(MicroscopeView):
self.microscope.write_config(payload.json)
self.microscope.save_config()
return jsonify(self.microscope.config)
return jsonify(self.microscope.read_config(json_safe=True))
def construct_blueprint(microscope_obj):

6
openflexure_microscope/microscope.py
View file

@ -200,14 +200,14 @@ class Microscope(object):
# Cache config
self.rc.write(config)
def read_config(self):
def read_config(self, json_safe=False):
"""
Read an updated config including camera settings.
"""
# If attached to a camera
if self.camera:
# Update camera config params from StreamingCamera object
self.rc.write(self.camera.config)
self.rc.write(self.camera.read_config())
# If attached to a stage
if self.stage:
@ -225,7 +225,7 @@ class Microscope(object):
self.rc.write(backlash)
return self.rc.read()
return self.rc.read(json_safe=json_safe)
def save_config(self):
"""