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

Tidied and improved JSON representations

Browse source
This commit is contained in:
jtc42 2019-11-15 16:51:48 +00:00
parent d79fd55301
commit 0907d013cd
6 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
openflexure_microscope/api/v2/blueprints/captures.py
View file

@ -61,9 +61,7 @@ class ListAPI(MicroscopeView):
:status 200: capture found
:status 404: no capture found with that id
"""
include_unavailable = get_bool(request.args.get("include_unavailable"))
representation = captures_representation(self.microscope.camera.images, include_unavailable=include_unavailable)
representation = captures_representation(self.microscope.camera.images)
return jsonify(representation)
@ -132,11 +130,9 @@ class CaptureAPI(MicroscopeView):
"""
all_captures = captures_representation(self.microscope.camera.images, include_unavailable=True)
if capture_id in all_captures:
representation = all_captures[capture_id]
else:
try:
representation = captures_representation(self.microscope.camera.images)[capture_id]
except KeyError:
return abort(404) # 404 Not Found
return jsonify(representation)