Skip to content
Snippets Groups Projects
Commit c614c526 authored by David Hoese's avatar David Hoese
Browse files

Merge branch 'ux-content-disposition' into 'master'

Fix content-disposition for csv, xml, sh, and bat formats in APIs

Closes MetObsSite#1

See merge request !3
parents 0917d61c 36e671d5
Branches
No related tags found
1 merge request!3Fix content-disposition for csv, xml, sh, and bat formats in APIs
......@@ -168,7 +168,9 @@ def handle_csv(frame, epoch, sep=',',
symbol_data="\n".join(data_lines),
)
return Response(output, mimetype='text/csv'), code
res = Response(output, mimetype='text/csv')
res.headers.set('Content-Disposition', 'attachment', filename='data.csv')
return res, code
@as_json_p(optional=True)
......@@ -261,7 +263,9 @@ def handle_xml(frame, epoch, sep=',',
head.appendChild(columns_elem)
head.appendChild(data_elem)
txt = doc.toxml(encoding="utf-8")
return Response(txt, mimetype='text/xml'), code
res = Response(txt, mimetype='text/xml')
res.headers.set('Content-Disposition', 'attachment', filename='data.xml')
return res, code
def handle_error(fmt, error_str):
......
......@@ -112,7 +112,9 @@ def handle_csv(frame, message='', code=200, status='success'):
rows=rows,
)
return Response(output, mimetype='text/csv'), code
res = Response(output, mimetype='text/csv')
res.headers.set('Content-Disposition', 'attachment', filename='files.csv')
return res, code
def handle_sh(frame, message='', code=200, status='success'):
......@@ -147,7 +149,9 @@ EOF
num_results=frame.shape[0] if frame is not None else 0,
url_list='\n'.join(str(x) for x in frame['url']) if frame is not None else '',
)
return Response(output, mimetype='text/plain'), code
res = Response(output, mimetype='text/plain')
res.headers.set('Content-Disposition', 'attachment', filename='files.sh')
return res, code
def handle_bat(frame, message='', code=200, status='success'):
......@@ -209,7 +213,9 @@ if not exist %cd%\\data\\{directory} (
)
# windows line endings
output = output.replace('\n', '\r\n')
return Response(output, mimetype='text/plain'), code
res = Response(output, mimetype='text/plain')
res.headers.set('Content-Disposition', 'attachment', filename='files.bat')
return res, code
@as_json_p(optional=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment