7 files changed, 29 insertions, 21 deletions
diff --git a/animism-align/.gitignore b/animism-align/.gitignore
index 5fe2913..7165956 100644
--- a/animism-align/.gitignore
+++ b/animism-align/.gitignore
@@ -20,6 +20,7 @@ webpack-stats.dev.json
 _local/
 *db.sqlite3
 __pycache__
+*.pyc
 deploy_settings.py
 s3cfg
 .DS_Store
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
deleted 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())
diff --git a/animism-align/frontend/views/upload/components/upload.index.js b/animism-align/frontend/views/upload/components/upload.index.js
index d17c4ca..3a7ae4b 100644
--- a/animism-align/frontend/views/upload/components/upload.index.js
+++ b/animism-align/frontend/views/upload/components/upload.index.js
@@ -79,12 +79,12 @@ export default class UploadIndex extends Component {
 
 const UploadItem = ({ data }) => {
   // console.log(data)
-  const imageUri = uploadUri(data)
+  // const imageUri = uploadUri(data)
   return (
     <div className='cell'>
       <div className='img'>
         <Link to={"/upload/" + data.id + "/show/"}>
-          <img src={imageUri} alt={"Uploaded image"} />
+          <img src={data.url} alt={"Uploaded image"} />
         </Link>
       </div>
       <div className='meta center'>
diff --git a/animism-align/frontend/views/upload/upload.actions.js b/animism-align/frontend/views/upload/upload.actions.js
index a04e4d8..c5d12e3 100644
--- a/animism-align/frontend/views/upload/upload.actions.js
+++ b/animism-align/frontend/views/upload/upload.actions.js
@@ -4,10 +4,11 @@ import { api, post, pad, preloadImage } from '../../util'
 import actions from '../../actions'
 import { session } from '../../session'
 
-export const upload = file => dispatch => {
+export const upload = (image, tag='upload') => dispatch => {
   const formData = {
-    'image': file,
-    'username': 'animism', // session('username'),
+    image,
+    tag,
+    username: 'animism', // session('username'),
   }
   // console.log(formData)
   return actions.upload.upload(formData).then(data => {
diff --git a/animism-align/frontend/views/upload/upload.css b/animism-align/frontend/views/upload/upload.css
index 8d77754..1dc8ac0 100644
--- a/animism-align/frontend/views/upload/upload.css
+++ b/animism-align/frontend/views/upload/upload.css
@@ -7,4 +7,5 @@
 }
 .upload > div:last-child {
   flex: 1;
+  width: 100%;
 }
 \ No newline at end of file