photo-objects 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

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/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/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/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.dist-info → photo_objects-0.6.0.dist-info}/METADATA

@@ -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.dist-info → photo_objects-0.6.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
 photo_objects/__init__.py,sha256=I1508w_ntomEqTFQgC74SurhxVXfCiDWZLRsny2f59g,60
 photo_objects/config.py,sha256=0-Aeo-z-d_fxx-cjAjxSwPJZUgYaAi7NTodiErlxIXo,861
 photo_objects/error.py,sha256=7afLYjxM0EaYioxVw_XUqHTvfSMSuQPUwwle0OVlaDY,45
-photo_objects/img.py,sha256=8FNxKFBVuSyxO_jA3W3PMag3bZ7sEXYKG78rpgxq71Q,4515
+photo_objects/img.py,sha256=2HVGS2g7rS2hnomozYL92oxrcN6zjDTHvWNr-UAqtGQ,4620
 photo_objects/utils.py,sha256=sYliXid-bv2EgNA97woRaOnWU75yZFq7fuqzWaseiDg,139
 photo_objects/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/admin.py,sha256=ubYfhsWQ85_2moYGZCVneLQ2DVEetbVpvBNisIrtuhw,170
 photo_objects/django/apps.py,sha256=Apqu6o6fpoxda18NQgKupvQRvTAZxVviIK_-dUR3rck,1444
-photo_objects/django/conf.py,sha256=s5lUbSLpjRWKlE2eYqAZmz60q4Oe10-e7JbIERPa6qI,2463
+photo_objects/django/conf.py,sha256=ZpeIulEc1tpr8AO52meNKOF30Xf5osbDtDyHvQRtkx4,2593
 photo_objects/django/context_processors.py,sha256=DLhLZHAvGlrpxYegaLiKEx9X7rpyZUFiAnAVF9jjkFA,165
 photo_objects/django/forms.py,sha256=XiCNqjVqPDn_aV4nGM1z5NfLKHd6_ipm7y0YRt3sXgY,6505
 photo_objects/django/models.py,sha256=M40ZFSIX3WgyVXfHQY9SXQOY0s3fpFqfCxNV3CBD5M8,5753
-photo_objects/django/objsto.py,sha256=5z4F8pft01WKLBipyE3Ro9Ac9AvWbuV_rG9Iiour90E,3588
+photo_objects/django/objsto.py,sha256=B7DxPWuqFaPFXPLhsHCFlqIzYl7EXLxcHde6zJDe89A,4238
 photo_objects/django/signals.py,sha256=Q_Swjl_9z6B6zP-97D_ep5zGSAEgmQfwUz0utMDY93A,1624
 photo_objects/django/urls.py,sha256=pCUTxg4xSd3ZD8BZVjULb9QpJQ03Ek6-sKoVnYG3-OY,1975
 photo_objects/django/api/__init__.py,sha256=BnEHlm3mwyBy-1xhk-NFasgZa4fjCDjtfkBUoH0puPY,62
@@ -43,7 +43,7 @@ photo_objects/django/views/utils.py,sha256=oP9B6QtHPaukX97rqIlCHxanduktPGFVSCGkG
 photo_objects/django/views/api/__init__.py,sha256=SxK-b7MgMtD9VRMz46rDV5qtm6AvkRcg3Moa1AWl5pY,108
 photo_objects/django/views/api/album.py,sha256=EZMOkxYzLSWr9wwXnd4yAO64JtXZq2k3FYohiNMFbGQ,1602
 photo_objects/django/views/api/auth.py,sha256=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZRLilzrvc8Y,819
-photo_objects/django/views/api/photo.py,sha256=FQCqcnPwSaEJ9MVggQF09E4WD1wVFmLZnT_pFFpWGvA,3502
+photo_objects/django/views/api/photo.py,sha256=iWDTBWrzztIKcfW7G6vh1eYTuH2JW129iOLSHjTfXCE,3743
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
 photo_objects/django/views/ui/__init__.py,sha256=N3ro5KggdV-JnfyHwoStX73b3SbVbpcsMuQNlxntVJs,92
 photo_objects/django/views/ui/album.py,sha256=PmVXAmqVjKLAie1NyB-qXO3eLqOmhIA8PTAGJewgxko,4738
@@ -51,8 +51,8 @@ photo_objects/django/views/ui/configuration.py,sha256=oX6SV0TFBpbaxfp4cXIdSL41YJ
 photo_objects/django/views/ui/photo.py,sha256=Zo-HE-CzMSLFEtDTL1ds1HnXi3ORsIym4iWa_ZMCPpc,6299
 photo_objects/django/views/ui/users.py,sha256=nb73cnzuV98QkJb0j8F2hqPgOGFIWpUFTFu6dXMeVwM,722
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.5.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.5.0.dist-info/METADATA,sha256=9fsj7gKM1NHpOblwzeKWpDkKh4ygJ_HmfafdEQa1aik,3605
-photo_objects-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.5.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.5.0.dist-info/RECORD,,
+photo_objects-0.6.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.6.0.dist-info/METADATA,sha256=zaLGXBdjS2a4m9TXnbLG36LtT1EqCtmEFdloP2Dub_U,3605
+photo_objects-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.6.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.6.0.dist-info/RECORD,,