photo-objects 0.5.0__tar.gz → 0.6.0__tar.gz

{photo_objects-0.5.0 → photo_objects-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.5.0
+Version: 0.6.0
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.5.0 → photo_objects-0.6.0}/photo_objects/django/conf.py

@@ -30,20 +30,25 @@ class PhotoSizeDimensions:
     max_width: int = None
     max_height: int = None
     max_aspect_ratio: float = None
+    image_format: str = None
 
 
 DEFAULT_SM = dict(
     max_width=512,
     max_height=512,
-    max_aspect_ratio=1.5
+    max_aspect_ratio=1.5,
+    image_format='WEBP'
 )
 DEFAULT_MD = dict(
-    max_width=2048,
-    max_height=2048
+    max_width=1024,
+    max_height=1024,
+    max_aspect_ratio=1.5,
+    image_format="JPEG"
 )
 DEFAULT_LG = dict(
-    max_width=4096,
-    max_height=4096
+    max_width=2048,
+    max_height=2048,
+    image_format='WEBP'
 )
 
 

{photo_objects-0.5.0 → photo_objects-0.6.0}/photo_objects/django/objsto.py

@@ -2,6 +2,7 @@ from dataclasses import asdict
 from io import BytesIO
 import json
 import mimetypes
+import re
 import urllib3
 
 from minio import Minio, S3Error
@@ -60,8 +61,30 @@ def photo_path(album_key, photo_key, size_key):
     return f"{size_key}/{album_key}/{photo_key}"
 
 
-def put_photo(album_key, photo_key, size_key, photo_file):
-    content_type = mimetypes.guess_type(photo_key)[0]
+def _photo_filename(photo_key: str, image_format: str = None) -> str:
+    if image_format:
+        filename = re.sub(r'\.[^.]+$', '', photo_key)
+        return f"{filename}.{image_format.lower()}"
+
+    return photo_key
+
+
+def photo_content_headers(
+    photo_key: str,
+    image_format: str = None,
+) -> tuple[str, dict[str, str]]:
+    filename = _photo_filename(photo_key, image_format)
+
+    content_type = mimetypes.guess_type(filename, strict=False)[0]
+    headers = {
+        "Content-Disposition": f"inline; filename={filename}"
+    }
+
+    return content_type, headers
+
+
+def put_photo(album_key, photo_key, size_key, photo_file, image_format=None):
+    content_type, headers = photo_content_headers(photo_key, image_format)
 
     client, bucket = _objsto_access()
     return client.put_object(
@@ -71,6 +94,7 @@ def put_photo(album_key, photo_key, size_key, photo_file):
         length=-1,
         part_size=10 * MEGABYTE,
         content_type=content_type,
+        metadata=headers
     )
 
 

{photo_objects-0.5.0 → photo_objects-0.6.0}/photo_objects/django/views/api/photo.py

@@ -91,14 +91,23 @@ def get_img(request: HttpRequest, album_key: str, photo_key: str):
                 404 if code == "NoSuchKey" else 500,
             ).json_response
 
-        sizes = photo_sizes()
+        size_params = getattr(photo_sizes(), size)
         # TODO: handle error
         scaled_photo = scale_photo(
-            original_photo, photo_key, **asdict(getattr(sizes, size)))
+            original_photo, photo_key, **asdict(size_params))
 
         # TODO: handle error
         scaled_photo.seek(0)
-        objsto.put_photo(album_key, photo_key, size, scaled_photo)
+        objsto.put_photo(
+            album_key,
+            photo_key,
+            size,
+            scaled_photo,
+            size_params.image_format)
+
+        content_type, headers = objsto.photo_content_headers(
+            photo_key, size_params.image_format)
 
         scaled_photo.seek(0)
-        return HttpResponse(scaled_photo.read(), content_type=content_type)
+        return HttpResponse(
+            scaled_photo.read(), content_type=content_type, headers=headers)

{photo_objects-0.5.0 → photo_objects-0.6.0}/photo_objects/img.py

@@ -66,7 +66,10 @@ def _read_camera_setup_and_settings(image: Image) -> dict:
         raise e
 
 
-def _image_format(filename):
+def _image_format(image_format, filename):
+    if image_format:
+        return image_format
+
     image_format = filename.split('.')[-1].upper()
 
     if image_format == "JPG":
@@ -131,7 +134,8 @@ def scale_photo(
         filename,
         max_width=None,
         max_height=None,
-        max_aspect_ratio=None):
+        max_aspect_ratio=None,
+        image_format=None):
     image = Image.open(photo_file)
     width, height = image.size
 
@@ -164,5 +168,5 @@ def scale_photo(
         resized = image.resize(new_size, Image.Resampling.LANCZOS)
 
     b = BytesIO()
-    resized.save(b, _image_format(filename))
+    resized.save(b, _image_format(image_format, filename))
     return b

{photo_objects-0.5.0 → photo_objects-0.6.0}/photo_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.5.0
+Version: 0.6.0
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.5.0 → photo_objects-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
     "markdown~=3.7",
     "minio~=7.2",