Merge pull request #88 from ComputerScienceHouse/feature/tag-content-disposition

Tag content-disposition on uploads

Author: Mstrodl

gallery/__init__.py

@@ -8,7 +8,7 @@
 
 from datetime import timedelta
 from sys import stderr
-from typing import Any, Dict, Optional, List, Union, cast
+from typing import Any, Dict, Optional, List, Union, cast, Tuple
 
 from alembic import command
 import click
@@ -180,14 +180,16 @@ def upload_file(auth_dict: Optional[Dict[str, Any]] = None):
             assert dir_path
             assert parent
             assert owner
-            file_model = add_file(filename, dir_path, parent, "", owner)
+            mime, file_model = add_file(filename, dir_path, parent, "", owner)
 
             # Upload File
             file_stat = os.stat(filepath)
             with open(filepath, "rb") as f_hnd:
                 storage_interface.put(
                     "files/{}".format(file_model.s3_id),
-                    f_hnd
+                    f_hnd,
+                    filename,
+                    mime
                 )
             os.remove(filepath)
 
@@ -198,6 +200,8 @@ def upload_file(auth_dict: Optional[Dict[str, Any]] = None):
                 storage_interface.put(
                     "thumbnails/" + file_model.s3_id,
                     f_hnd,
+                    "thumb_" + filename + "." + filepath.split(".")[-1],
+                    "image/gif" if filepath.endswith(".gif") else "image/jpeg"
                 )
             os.remove(filepath)
             os.rmdir(dir_path)
@@ -347,6 +351,8 @@ def init_root():
             storage_interface.put(
                 "files/{}".format(DEFAULT_THUMBNAIL_NAME),
                 f_hnd,
+                "thumb_" + DEFAULT_THUMBNAIL_NAME + ".jpg",
+                "image/jpeg"
             )
 
 
@@ -367,12 +373,12 @@ def add_directory(parent_id: str, name: str, description: str, owner: str):
     return dir_model.id
 
 
-def add_file(file_name: str, path: str, dir_id: str, description: str, owner: str) -> Optional[File]:
+def add_file(file_name: str, path: str, dir_id: str, description: str, owner: str) -> Tuple[str, Optional[File]]:
     file_path = os.path.join('/', path, file_name)
 
-    file_data = parse_file_info(file_path, path)
+    mime, file_data = parse_file_info(file_path, path)
     if file_data is None:
-        return None
+        return mime, None
 
     file_model = File(
         dir_id,
@@ -389,7 +395,7 @@ def add_file(file_name: str, path: str, dir_id: str, description: str, owner: st
     db.session.flush()
     db.session.commit()
     db.session.refresh(file_model)
-    return file_model
+    return mime, file_model
 
 
 def refresh_directory_thumbnail(dir_model: Directory) -> str:

gallery/file_modules/__init__.py

@@ -1,6 +1,6 @@
 import magic
 import os
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 from wand.image import Image
 from wand.color import Color
 
@@ -87,15 +87,17 @@ def generate_thumbnail(self):
 
 
 # classism
-def parse_file_info(file_path: str, dir_path: str) -> Optional[FileModule]:
+def parse_file_info(file_path: str, dir_path: str) -> Tuple[str, Optional[FileModule]]:
     print("entering parse_file_info")
     mime_type = magic.from_file(file_path, mime=True)
     print(mime_type)
     print(file_path)
+
+    model = None
     if mime_type in file_mimetype_relation:
-        return file_mimetype_relation[mime_type](file_path, dir_path)
+        model = file_mimetype_relation[mime_type](file_path, dir_path)
 
-    return None
+    return mime_type, model
 
 
 def supported_mimetypes() -> List[str]:

gallery/file_store.py

@@ -19,7 +19,7 @@ class FileStorage(object):
     thumbnail data persistantly.
     """
 
-    def put(self, key: str, handle: IO[bytes]):
+    def put(self, key: str, handle: IO[bytes], filename: str, mime: str):
         """
         put is used to stream data from a local file descriptor into the backing
         storage implementation.
@@ -72,7 +72,7 @@ def _temp_link_handler(self, token: str):
         # sign and verify the file path anyway
         return send_from_directory(self._base_dir, payload["key"])
 
-    def put(self, key: str, handle: IO[bytes]):
+    def put(self, key: str, handle: IO[bytes], filename: str, mime: str):
         local_path = os.path.join(self._base_dir, key)
         os.makedirs(os.path.dirname(local_path), exist_ok=True)
         with open(local_path, 'wb+') as f:
@@ -103,8 +103,14 @@ def __init__(self, app: flask.Flask):
         self._bucket = app.config['S3_BUCKET_ID']
         self._link_expiration = timedelta(minutes=5)
 
-    def put(self, key: str, handle: IO[bytes]):
-        self._client.upload_fileobj(handle, self._bucket, key)
+    def put(self, key: str, handle: IO[bytes], filename: str, mime: str):
+        self._client.upload_fileobj(
+            handle, self._bucket, key,
+            ExtraArgs={
+                "ContentDisposition": f'inline; filename="{filename}"',
+                "ContentType": mime,
+            }
+        )
 
     def remove(self, key: str):
         self._client.delete_object(Bucket=self._bucket, Key=key)

requirements.txt

@@ -1,6 +1,6 @@
 Flask==1.0.2
 Flask-pyoidc==2.0.0
-csh_ldap~=2.2.0
+csh_ldap~=2.3.1
 addict==2.2.0
 flask_sqlalchemy==2.5
 flask_migrate==2.3.1