|
1 | 1 | import os
|
2 |
| -from flask import Flask, g, render_template, request, jsonify, url_for, send_file |
| 2 | +from flask import Flask, g, render_template, request, jsonify, url_for, send_file, Response, make_response |
3 | 3 | import sqlalchemy
|
4 | 4 | from cloud_dfs.token import TokenManager, NotAvailableTokenError
|
5 | 5 | from cloud_dfs.database.models import Data, DataGroup
|
@@ -150,18 +150,23 @@ def get_data(hex_token):
|
150 | 150 | print("Got Data :", data_obj)
|
151 | 151 |
|
152 | 152 | if data_obj.data_type == 'binary':
|
153 |
| - return send_file(data_obj.path, mimetype='application/octet-stream', |
154 |
| - as_attachment=True, attachment_filename=data_obj.name), 200 |
| 153 | + response = make_response(send_file(data_obj.path, mimetype='application/octet-stream', |
| 154 | + as_attachment=True, attachment_filename=data_obj.name)) |
155 | 155 | elif data_obj.data_type == 'text':
|
156 | 156 | with open(data_obj.path, 'rt') as f:
|
157 | 157 | data = f.read()
|
158 |
| - return jsonify({ |
| 158 | + |
| 159 | + response = make_response(jsonify({ |
159 | 160 | 'name': data_obj.name,
|
160 | 161 | 'data': data
|
161 |
| - }), 200 |
| 162 | + })) |
162 | 163 | else:
|
163 | 164 | return '', 500
|
164 | 165 |
|
| 166 | + response.status_code = 200 |
| 167 | + response.headers['Access-Control-Allow-Origin'] = '*' |
| 168 | + return response |
| 169 | + |
165 | 170 | @app.route('/data/<hex_token>', methods=['DELETE'])
|
166 | 171 | def del_data(hex_token):
|
167 | 172 | token = bytes.fromhex(hex_token)
|
|
0 commit comments