diff options
Diffstat (limited to 'animism-align/cli/app/controllers/upload_controller.py')
| -rw-r--r-- | animism-align/cli/app/controllers/upload_controller.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/animism-align/cli/app/controllers/upload_controller.py b/animism-align/cli/app/controllers/upload_controller.py index 5fec077..1a324cb 100644 --- a/animism-align/cli/app/controllers/upload_controller.py +++ b/animism-align/cli/app/controllers/upload_controller.py @@ -53,6 +53,11 @@ class UploadView(FlaskView): except: raise APIError('No username specified') + try: + tag = request.form.get('tag') + except: + raise APIError('No tag specified') + param_name = 'image' if param_name not in request.files: raise APIError('No file uploaded') @@ -93,11 +98,10 @@ class UploadView(FlaskView): session.close() return jsonify(response) - tag = request.form.get('tag') uploaded_im_fn = secure_filename(file.filename) uploaded_im_abspath = os.path.join(app_cfg.DIR_UPLOADS, tag) uploaded_im_fullpath = os.path.join(uploaded_im_abspath, uploaded_im_fn) - uploaded_im_stored_fn = os.path.join(tag, uploaded_im_fn) + uploaded_im_stored_fn = uploaded_im_fn os.makedirs(uploaded_im_abspath, exist_ok=True) # nparr.tofile(uploaded_im_fullpath) @@ -128,9 +132,10 @@ class UploadView(FlaskView): sha256 = upload.sha256 fn = upload.fn + tag = upload.tag # uploaded_im_fn = secure_filename(fn) - uploaded_im_abspath = os.path.join(app_cfg.DIR_UPLOADS, fn) + uploaded_im_abspath = os.path.join(app_cfg.DIR_UPLOADS, tag, fn) # uploaded_im_fullpath = os.path.join(uploaded_im_abspath, fn) if os.path.exists(uploaded_im_abspath): print("Removing " + uploaded_im_abspath) |