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

photo_objects/django/api/photo.py

@@ -17,6 +17,7 @@ from photo_objects.img import photo_details
 from .auth import check_album_access, check_photo_access
 from .utils import (
     FormValidationFailed,
+    UploadPhotosFailed,
     JsonProblem,
     check_permissions,
     parse_input_data,
@@ -57,7 +58,7 @@ def _upload_photo(album_key: str, photo_file: UploadedFile):
         photo.delete()
 
         msg = objsto.with_error_code(
-            "Could not save photo to object storage", e)
+            "Could not save photo to object storage.", e)
         logger.error(f"{msg}: {str(e)}")
         raise JsonProblem(f"{msg}.", 500) from e
 
@@ -73,6 +74,17 @@ def upload_photo(request: HttpRequest, album_key: str):
     return _upload_photo(album_key, photo_file)
 
 
+def _join_errors(errors: dict) -> str:
+    messages = []
+    for _, errs in errors.items():
+        for err in errs:
+            try:
+                messages.append(err.get('message'))
+            except AttributeError:
+                messages.append(str(err))
+    return " ".join(messages) if messages else "Unknown error."
+
+
 def upload_photos(request: HttpRequest, album_key: str):
     check_permissions(
         request,
@@ -92,12 +104,18 @@ def upload_photos(request: HttpRequest, album_key: str):
     for photo_file in f.cleaned_data["photos"]:
         try:
             photos.append(_upload_photo(album_key, photo_file))
-        except JsonProblem:
-            # TODO: include error type in the message
-            f.add_error("photos", f"Failed to upload {photo_file.name}.")
+        except FormValidationFailed as e:
+            message = _join_errors(e.form.errors.get_json_data())
+            f.add_error(
+                "photos",
+                f"Failed to upload {photo_file.name}. {message}")
+        except JsonProblem as e:
+            f.add_error(
+                "photos",
+                f"Failed to upload {photo_file.name}. {e.title}")
 
     if not f.is_valid():
-        raise FormValidationFailed(f)
+        raise UploadPhotosFailed(f, [i.filename for i in photos])
 
     return photos
 

photo_objects/django/api/utils.py

@@ -129,6 +129,12 @@ class FormValidationFailed(JsonProblem):
         self.form = form
 
 
+class UploadPhotosFailed(FormValidationFailed):
+    def __init__(self, form: ModelForm, uploaded_photos: list[str]):
+        super().__init__(form)
+        self.uploaded_photos = uploaded_photos
+
+
 def check_permissions(request: HttpRequest, *permissions: str):
     if not request.user.is_authenticated:
         raise Unauthorized()

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/context_processors.py

@@ -1,8 +1,12 @@
-from importlib.metadata import version
+from importlib.metadata import PackageNotFoundError, version
 
 
 class Metadata:
-    version = version('photo_objects')
+    def __init__(self):
+        try:
+            self.version = version('photo_objects')
+        except PackageNotFoundError:
+            self.version = None
 
 
 def metadata(_):

photo_objects/django/forms.py

@@ -195,7 +195,11 @@ class CreatePhotoForm(ModelForm):
         error_messages = {
             'album': {
                 'invalid_choice': _('Album with %(value)s key does not exist.')
-            }
+            },
+            'key': {
+                'unique': _(
+                    'Photo with this filename already exists in the album.'),
+            },
         }
 
 

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/tests/test_og_meta.py

@@ -0,0 +1,60 @@
+from django.contrib.sites.models import Site
+
+from photo_objects.django.models import Album, Photo, SiteSettings
+
+from .utils import TestCase, create_dummy_photo, temp_static_files
+
+
+PHOTOS_DIRECTORY = "photos"
+
+
+class OgMetaTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        album = Album.objects.create(
+            key="paris", visibility=Album.Visibility.PUBLIC)
+
+        create_dummy_photo(album, "tower.jpeg")
+
+    @temp_static_files
+    def test_albums_og_meta(self):
+        og_title = '<meta property="og:title" content="Test" />'
+
+        response = self.client.get("/albums")
+        self.assertNotContains(
+            response,
+            og_title,
+            status_code=200,
+            html=True)
+
+        site = Site.objects.get(id=1)
+        site.name = "Test"
+        site.domain = "test.example.com"
+        site.save()
+
+        response = self.client.get("/albums")
+        self.assertNotContains(
+            response,
+            og_title,
+            status_code=200,
+            html=True)
+
+        site_settings = SiteSettings.objects.get(site=site)
+        site_settings.description = "Description"
+        site_settings.preview_image = Photo.objects.get(key="paris/tower.jpeg")
+        site_settings.save()
+
+        tags = [
+            og_title,
+            '<meta property="og:description" content="Description" />',
+            '<meta property="og:image" content="https://test.example.com/img/paris/tower.jpeg/md"/>',  # noqa: E501
+            '<meta property="og:url" content="https://test.example.com/albums" />',  # noqa: E501
+        ]
+
+        response = self.client.get("/albums")
+        for tag in tags:
+            self.assertContains(
+                response,
+                tag,
+                status_code=200,
+                html=True)

photo_objects/django/tests/test_photo.py

@@ -184,6 +184,15 @@ class PhotoViewTests(TestCase):
                 {filename: file})
         self.assertStatus(response, 500)
 
+        response = self.client.get(
+            "/api/albums/test-photo-a/photos/tower.jpg")
+        self.assertStatus(response, 404)
+
+        response = self.client.get(
+            "/api/albums/test-photo-a/photos")
+        self.assertStatus(response, 200)
+        self.assertEqual(len(response.json()), 0)
+
     def test_get_image_scales_the_image(self):
         login_success = self.client.login(
             username='has_permission', password='test')

photo_objects/django/tests/utils.py

@@ -1,7 +1,11 @@
 from dataclasses import dataclass
+from io import StringIO
 import os
+import shutil
+import tempfile
 
 from django.conf import settings
+from django.core.management import call_command
 from django.test import TestCase as DjangoTestCase, override_settings
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
@@ -120,3 +124,20 @@ def parse_timestamps(data):
     return Timestamps(
         created_at=data.get('created_at'),
         updated_at=data.get('updated_at'))
+
+
+# Based on https://stackoverflow.com/a/76745063
+def temp_static_files(func):
+    '''Decorator that creates a temporary directory, configures that as
+    STATIC_ROOT, and collects static files there.'''
+    def wrapper(*args, **kwargs):
+        static_root = tempfile.mkdtemp(prefix="test_static_")
+        with override_settings(STATIC_ROOT=static_root):
+            try:
+                out = StringIO()
+                call_command("collectstatic", "--noinput", stdout=out)
+                func(*args, **kwargs)
+            finally:
+                shutil.rmtree(static_root)
+
+    return wrapper

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/django/views/ui/photo.py

@@ -3,7 +3,11 @@ from django.shortcuts import render
 from django.urls import reverse
 
 from photo_objects.django import api
-from photo_objects.django.api.utils import AlbumNotFound, FormValidationFailed
+from photo_objects.django.api.utils import (
+    AlbumNotFound,
+    FormValidationFailed,
+    UploadPhotosFailed,
+)
 from photo_objects.django.forms import ModifyPhotoForm, UploadPhotosForm
 from photo_objects.django.models import Photo
 from photo_objects.django.views.utils import (
@@ -24,10 +28,17 @@ def upload_photos(request: HttpRequest, album_key: str):
                 reverse(
                     'photo_objects:show_album',
                     kwargs={"album_key": album_key}))
-        except FormValidationFailed as e:
+        except UploadPhotosFailed as e:
             form = e.form
+            uploaded_count = len(e.uploaded_photos)
+            if uploaded_count > 0:
+                plural = 's' if uploaded_count != 1 else ''
+                info = f"Successfully uploaded {uploaded_count} photo{plural}."
+            else:
+                info = None
     else:
         form = UploadPhotosForm()
+        info = None
 
     album = api.check_album_access(request, album_key)
     target = album.title or album.key
@@ -38,6 +49,7 @@ def upload_photos(request: HttpRequest, album_key: str):
 
     return render(request, 'photo_objects/photo/upload.html', {
         "form": form,
+        "info": info,
         "title": "Upload photos",
         "back": back,
         "photo": album.cover_photo,

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.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.5.0
+Version: 0.7.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.7.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
 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/context_processors.py,sha256=DLhLZHAvGlrpxYegaLiKEx9X7rpyZUFiAnAVF9jjkFA,165
-photo_objects/django/forms.py,sha256=XiCNqjVqPDn_aV4nGM1z5NfLKHd6_ipm7y0YRt3sXgY,6505
+photo_objects/django/conf.py,sha256=ZpeIulEc1tpr8AO52meNKOF30Xf5osbDtDyHvQRtkx4,2593
+photo_objects/django/context_processors.py,sha256=XacUmcYV-4NMMMNXPWrHKdvNd6lfyamisngaVerREiU,306
+photo_objects/django/forms.py,sha256=LcznhXrqPfqRY5b2SwHBbC9-uux1FiZFdQBlHsKX5NU,6649
 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
 photo_objects/django/api/album.py,sha256=CJDeGLCuYoxGUDcjssZRpFnToxG_KVE9Ii7NduFW2ks,2003
 photo_objects/django/api/auth.py,sha256=lS0S1tMVH2uN30g4jlixklv3eMnQ2FbQVQvuRXeMGYo,1420
-photo_objects/django/api/photo.py,sha256=Gc4GHmcW0995_alE7Q6mdn7SMt9f1JJ-krv-p-SJi8Y,3870
-photo_objects/django/api/utils.py,sha256=kHOdXp-LEaEhL82LCLanQmVpU3jFi8KNSYOgIAv-IVs,5167
+photo_objects/django/api/photo.py,sha256=-lo1g6jfBr884wy-WV2DAEPxzH9V-tFUTRtitmA6i28,4471
+photo_objects/django/api/utils.py,sha256=xilnQndd1DXkNs6K6OqXpzUKkDSZFOG25xX3O2oJggU,5364
 photo_objects/django/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/management/commands/clean-scaled-photos.py,sha256=KJY6phgTCxcmbMUsUfCRQjatvCmKyFninM8zT-tB3Kc,2008
@@ -35,24 +35,25 @@ photo_objects/django/tests/test_album.py,sha256=yjxP_M0bddS9Xpg1d1Wk5OyJsmxmkdYu
 photo_objects/django/tests/test_auth.py,sha256=hgr1UMVLvSI1x5zY7wTEXSBKfM5E_sNMIFlx8mVWYPY,3928
 photo_objects/django/tests/test_commands.py,sha256=e3lE1ZhFR39WIq2VSKDNcQHUkSJqSWDYuAcAfu29svs,2955
 photo_objects/django/tests/test_img.py,sha256=HEAWcr5fpTkzePkhoQ4YrWsDO9TvFOr7my_0LqVbaO4,829
-photo_objects/django/tests/test_photo.py,sha256=FzSrtWMQjv_EL-M1zM6rYekw_YGuM87JkMHRcLvB2K8,13386
+photo_objects/django/tests/test_og_meta.py,sha256=Kk5a9KvE88KZ60gLqXSe6rTz5YU-gdjteksYolHd-nw,1804
+photo_objects/django/tests/test_photo.py,sha256=aZCZw7PIXIfIYX3q1lUxn8C53mLRBNK0qp18t7X4ZQ4,13696
 photo_objects/django/tests/test_utils.py,sha256=zBLv8lkvcLMCaH4D6GR1KZqUe-rPowhcBkQX19-Kshs,2007
-photo_objects/django/tests/utils.py,sha256=Yre-l6rlJn7tPeqFnzQdcmBBG-2vwuGzVLKX-2uQhDs,3643
+photo_objects/django/tests/utils.py,sha256=s_3hzQEY4tdja_8406s_SQyRC6fCYI_MBPqvFjC8fB4,4345
 photo_objects/django/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/views/utils.py,sha256=oP9B6QtHPaukX97rqIlCHxanduktPGFVSCGkGxf4lzI,1691
 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
 photo_objects/django/views/ui/configuration.py,sha256=oX6SV0TFBpbaxfp4cXIdSL41YJhy_aOy30TkBxOpq0M,5065
-photo_objects/django/views/ui/photo.py,sha256=Zo-HE-CzMSLFEtDTL1ds1HnXi3ORsIym4iWa_ZMCPpc,6299
+photo_objects/django/views/ui/photo.py,sha256=fVpKI-XqSV8KfoTpDYxceCHR3rJzuVYfmRRQx1I0YIQ,6649
 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.7.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.7.0.dist-info/METADATA,sha256=wHfCOuVG8iXwYP6V0arHPNUURsF2HV0PvBEBEcmnB0Q,3605
+photo_objects-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.7.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.7.0.dist-info/RECORD,,