1 files changed, 13 insertions, 19 deletions
diff --git a/animism-align/cli/app/controllers/upload_controller.py b/animism-align/cli/app/controllers/upload_controller.py
index a81312d..5ec4d77 100644
--- a/animism-align/cli/app/controllers/upload_controller.py
+++ b/animism-align/cli/app/controllers/upload_controller.py
@@ -54,41 +54,35 @@ class UploadView(FlaskView):
 
     try:
       username = request.form.get('username')
+      print(username)
     except:
       raise APIError('No username specified')
 
     try:
       tag = request.form.get('tag')
+      print(tag)
     except:
       raise APIError('No tag specified')
 
-    param_name = 'image'
-    if param_name not in request.files:
+    if 'image' in request.files:
+      file = request.files['image']
+      print(fn)
+    elif 'file' in request.files:
+      file = request.files['file']
+      # print(request.form.get('__image_filename'))
+      print(fn)
+    else:
       raise APIError('No file uploaded')
 
-    file = request.files[param_name]
-
     # get sha256
     sha256 = sha256_stream(file)
     _, ext = os.path.splitext(file.filename)
     if ext == '.jpeg':
       ext = '.jpg'
 
-    # TODO: here check sha256
-    # upload = Upload.query.get(id)
-
-    # if ext[1:] not in VALID_IMAGE_EXTS:
-      # return jsonify({ 'status': 'error', 'error': 'Not a valid image' })
+    ext = ext[1:]
 
-    # convert string of image data to uint8
     file.seek(0)
-    # nparr = np.fromstring(file.read(), np.uint8)
-
-    # decode image
-    # try:
-    #   im = Image.fromarray(nparr)
-    # except:
-    #   return jsonify({ 'status': 'error', 'error': 'Image parse error' })
 
     uploaded_im_fn = secure_filename(file.filename)
     uploaded_im_abspath = os.path.join(app_cfg.DIR_UPLOADS, tag)
@@ -97,14 +91,14 @@ class UploadView(FlaskView):
     session = Session()
     upload = session.query(Upload).filter_by(sha256=sha256).first()
     if upload is not None:
-      print("Already uploaded image")
+      print("Already uploaded file")
       if not os.path.exists(uploaded_im_fullpath):
         # if we got in some weird state where the record wasnt deleted....
         os.makedirs(uploaded_im_abspath, exist_ok=True)
         file.save(uploaded_im_fullpath)
       response = {
         'status': 'ok',
-        'notes': 'Image already uploaded',
+        'notes': 'File already uploaded',
         'res': upload.toJSON(),
       }
       session.close()