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

Removed redundant as_attachment response

Browse source
This commit is contained in:
Joel Collins 2019-01-18 16:07:50 +00:00
parent 533f5d9857
commit a15e797ce4
1 changed files with 5 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
openflexure_microscope/api/v1/blueprints/camera/capture.py
View file

@ -267,10 +267,9 @@ class DownloadRedirectAPI(MicroscopeView):
if not capture_obj or not capture_obj.state['available']: if not capture_obj or not capture_obj.state['available']:
return abort(404) # 404 Not Found return abort(404) # 404 Not Found
as_attachment = get_bool(request.args.get('as_attachment'))
thumbnail = get_bool(request.args.get('thumbnail')) thumbnail = get_bool(request.args.get('thumbnail'))
return redirect(url_for('.capture_download', capture_id=capture_id, filename=capture_obj.filename, as_attachment=as_attachment, thumbnail=thumbnail), code=307) return redirect(url_for('.capture_download', capture_id=capture_id, filename=capture_obj.filename, thumbnail=thumbnail), code=307)
class DownloadAPI(MicroscopeView): class DownloadAPI(MicroscopeView):
@ -293,7 +292,6 @@ class DownloadAPI(MicroscopeView):
:>header Accept: image/jpeg :>header Accept: image/jpeg
:query thumbnail: return an image thumbnail e.g. ?thumbnail=true :query thumbnail: return an image thumbnail e.g. ?thumbnail=true
:query as_attachment: return the image as an attachment download e.g. ?as_attachment=true
:>header Content-Type: image/jpeg :>header Content-Type: image/jpeg
:status 200: capture data found :status 200: capture data found
@ -304,12 +302,11 @@ class DownloadAPI(MicroscopeView):
if not capture_obj or not capture_obj.state['available']: if not capture_obj or not capture_obj.state['available']:
return abort(404) # 404 Not Found return abort(404) # 404 Not Found
as_attachment = get_bool(request.args.get('as_attachment'))
thumbnail = get_bool(request.args.get('thumbnail')) thumbnail = get_bool(request.args.get('thumbnail'))
# If no filename is specified, redirect to the capture's currently set filename # If no filename is specified, redirect to the capture's currently set filename
if not filename: if not filename:
return redirect(url_for('capture_download', capture_id=capture_id, filename=capture_obj.filename, as_attachment=as_attachment, thumbnail=thumbnail), code=307) return redirect(url_for('capture_download', capture_id=capture_id, filename=capture_obj.filename, thumbnail=thumbnail), code=307)
# Download the image data using the requested filename # Download the image data using the requested filename
if thumbnail: if thumbnail:
@ -319,9 +316,7 @@ class DownloadAPI(MicroscopeView):
return send_file( return send_file(
img, img,
mimetype='image/jpeg', mimetype='image/jpeg')
as_attachment=as_attachment,
attachment_filename=filename)
class MetadataRedirectAPI(MicroscopeView): class MetadataRedirectAPI(MicroscopeView):
@ -338,9 +333,7 @@ class MetadataRedirectAPI(MicroscopeView):
if not capture_obj or not capture_obj.state['available']: if not capture_obj or not capture_obj.state['available']:
return abort(404) # 404 Not Found return abort(404) # 404 Not Found
as_attachment = get_bool(request.args.get('as_attachment')) return redirect(url_for('.metadata_download', capture_id=capture_id, filename=capture_obj.metadataname), code=307)
return redirect(url_for('.metadata_download', capture_id=capture_id, filename=capture_obj.metadataname, as_attachment=as_attachment), code=307)
class MetadataAPI(MicroscopeView): class MetadataAPI(MicroscopeView):
@ -373,8 +366,6 @@ class MetadataAPI(MicroscopeView):
if not capture_obj or not capture_obj.state['available']: if not capture_obj or not capture_obj.state['available']:
return abort(404) # 404 Not Found return abort(404) # 404 Not Found
as_attachment = get_bool(request.args.get('as_attachment'))
# If no filename is specified, redirect to the capture's currently set filename # If no filename is specified, redirect to the capture's currently set filename
if not filename: if not filename:
return redirect(url_for('capture_download', capture_id=capture_id, filename=capture_obj.metadataname, as_attachment=as_attachment), code=307) return redirect(url_for('capture_download', capture_id=capture_id, filename=capture_obj.metadataname, as_attachment=as_attachment), code=307)
@ -382,12 +373,6 @@ class MetadataAPI(MicroscopeView):
# Download the metadata using the requested filename # Download the metadata using the requested filename
data = capture_obj.yaml data = capture_obj.yaml
headers = {}
if as_attachment:
headers["Content-Disposition"] = "attachment;filename={}".format(filename)
return Response( return Response(
data, data,
mimetype="text/yaml", mimetype="text/yaml")
headers=headers)