diff options
Diffstat (limited to 'animism-align/cli/app/controllers/upload_controller.py')
| -rw-r--r-- | animism-align/cli/app/controllers/upload_controller.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/animism-align/cli/app/controllers/upload_controller.py b/animism-align/cli/app/controllers/upload_controller.py index 86f9f29..aa29553 100644 --- a/animism-align/cli/app/controllers/upload_controller.py +++ b/animism-align/cli/app/controllers/upload_controller.py @@ -73,13 +73,13 @@ class UploadView(FlaskView): # convert string of image data to uint8 file.seek(0) - nparr = np.fromstring(file.read(), np.uint8) + # nparr = np.fromstring(file.read(), np.uint8) # decode image - try: - im = Image.fromarray(nparr) - except: - return jsonify({ 'status': 'error', 'error': 'Image parse error' }) + # try: + # im = Image.fromarray(nparr) + # except: + # return jsonify({ 'status': 'error', 'error': 'Image parse error' }) session = Session() upload = session.query(Upload).filter_by(sha256=sha256).first() @@ -93,14 +93,14 @@ class UploadView(FlaskView): session.close() return jsonify(response) - uploaded_im_fn = secure_filename(sha256 + ext) + uploaded_im_fn = secure_filename(file.filename) uploaded_im_abspath = os.path.join(app_cfg.DIR_UPLOADS, sha256_tree(sha256)) uploaded_im_fullpath = os.path.join(uploaded_im_abspath, uploaded_im_fn) os.makedirs(uploaded_im_abspath, exist_ok=True) nparr.tofile(uploaded_im_fullpath) - upload = Upload(username=username, sha256=sha256, ext=ext) + upload = Upload(username=username, fn=uploaded_im_fn, sha256=sha256, ext=ext) session.add(upload) session.commit() response = { |