diff options
Diffstat (limited to 'animism-align/cli')
| -rw-r--r-- | animism-align/cli/app/controllers/__pycache__/media_controller.cpython-37.pyc | bin | 3740 -> 0 bytes | |||
| -rw-r--r-- | animism-align/cli/app/controllers/upload_controller.py | 22 | ||||
| -rw-r--r-- | animism-align/cli/app/sql/models/upload.py | 15 |
3 files changed, 21 insertions, 16 deletions
diff --git a/animism-align/cli/app/controllers/__pycache__/media_controller.cpython-37.pyc b/animism-align/cli/app/controllers/__pycache__/media_controller.cpython-37.pyc Binary files differdeleted file mode 100644 index e6dbaee..0000000 --- a/animism-align/cli/app/controllers/__pycache__/media_controller.cpython-37.pyc +++ /dev/null diff --git a/animism-align/cli/app/controllers/upload_controller.py b/animism-align/cli/app/controllers/upload_controller.py index aa29553..0b3b4c5 100644 --- a/animism-align/cli/app/controllers/upload_controller.py +++ b/animism-align/cli/app/controllers/upload_controller.py @@ -93,14 +93,17 @@ 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, sha256_tree(sha256)) + 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) os.makedirs(uploaded_im_abspath, exist_ok=True) - nparr.tofile(uploaded_im_fullpath) + # nparr.tofile(uploaded_im_fullpath) + file.save(uploaded_im_fullpath) - upload = Upload(username=username, fn=uploaded_im_fn, sha256=sha256, ext=ext) + upload = Upload(username=username, fn=uploaded_im_stored_fn, sha256=sha256, ext=ext) session.add(upload) session.commit() response = { @@ -124,13 +127,14 @@ class UploadView(FlaskView): }) sha256 = upload.sha256 + fn = upload.fn - uploaded_im_fn = secure_filename(sha256 + upload.ext) - 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) - if os.path.exists(uploaded_im_fullpath): - print("Removing " + uploaded_im_fullpath) - os.remove(uploaded_im_fullpath) + # uploaded_im_fn = secure_filename(fn) + uploaded_im_abspath = os.path.join(app_cfg.DIR_UPLOADS, fn) + # uploaded_im_fullpath = os.path.join(uploaded_im_abspath, fn) + if os.path.exists(uploaded_im_abspath): + print("Removing " + uploaded_im_abspath) + os.remove(uploaded_im_abspath) session.delete(upload) session.commit() diff --git a/animism-align/cli/app/sql/models/upload.py b/animism-align/cli/app/sql/models/upload.py index 5863b07..8680f19 100644 --- a/animism-align/cli/app/sql/models/upload.py +++ b/animism-align/cli/app/sql/models/upload.py @@ -31,14 +31,15 @@ class Upload(Base): 'created_at': self.created_at, } - def filename(self): - return "{}{}".format(self.fn) + # def filename(self): + # return "{}{}".format(self.fn) - def filepath(self): - return join(app_cfg.DIR_UPLOADS, sha256_tree(self.sha256)) + # def filepath(self): + # return join(app_cfg.DIR_UPLOADS, sha256_tree(self.sha256)) - def fullpath(self): - return join(self.filepath(), self.filename()) + # def fullpath(self): + # return join(self.filepath(), self.filename()) def url(self): - return join(app_cfg.URL_UPLOADS, sha256_tree(self.sha256), self.filename()) + return join('/static/data_store/uploads', self.fn) + # return join(app_cfg.URL_UPLOADS, sha256_tree(self.sha256), self.filename()) |