photo-objects 0.9.6__py3-none-any.whl → 0.10.0__py3-none-any.whl

photo_objects/django/api/photo.py

@@ -9,7 +9,6 @@ from photo_objects.django import objsto
 from photo_objects.django.forms import (
     CreatePhotoForm,
     ModifyPhotoForm,
-    UploadPhotosForm,
     slugify,
 )
 from photo_objects.img import photo_details
@@ -17,7 +16,6 @@ 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,
@@ -74,52 +72,6 @@ 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,
-        'photo_objects.add_photo',
-        'photo_objects.change_album')
-
-    f = UploadPhotosForm(request.POST, request.FILES)
-    if not f.is_valid():
-        raise FormValidationFailed(f)
-
-    photo_files = f.cleaned_data["photos"]
-    if len(photo_files) < 1:
-        f.add_error("photos", "Expected at least one file, got 0.")
-        raise FormValidationFailed(f)
-
-    photos = []
-    for photo_file in f.cleaned_data["photos"]:
-        try:
-            photos.append(_upload_photo(album_key, photo_file))
-        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 UploadPhotosFailed(f, [i.filename for i in photos])
-
-    return photos
-
-
 def modify_photo(request: HttpRequest, album_key: str, photo_key: str):
     check_permissions(request, 'photo_objects.change_photo')
     photo = check_photo_access(request, album_key, photo_key, 'xs')

photo_objects/django/api/utils.py

@@ -53,7 +53,8 @@ class JsonProblem(PhotoObjectsError):
                 'Albums',
                 reverse_lazy('photo_objects:list_albums')),
             "problem_title": self.title,
-            "status": self.status
+            "status": self.status,
+            "width": "narrow",
         }, status=self.status)
 
 
@@ -137,12 +138,6 @@ 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/forms.py

@@ -3,9 +3,6 @@ import random
 from django import forms
 from django.forms import (
     CharField,
-    ClearableFileInput,
-    FileField,
-    Form,
     HiddenInput,
     ModelForm,
     RadioSelect,
@@ -220,26 +217,3 @@ class ReviewPhotoChangeRequestForm(ModelForm):
         help_texts = {
             'alt_text': ALT_TEXT_HELP,
         }
-
-
-class MultipleFileInput(ClearableFileInput):
-    allow_multiple_selected = True
-
-
-class MultipleFileField(FileField):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('widget', MultipleFileInput())
-        super().__init__(*args, **kwargs)
-
-    def clean(self, data, initial=None):
-        single_file_clean = super().clean
-        if isinstance(data, (list, tuple)):
-            result = [single_file_clean(d, initial) for d in data]
-        else:
-            result = [single_file_clean(data, initial)]
-        return result
-
-
-class UploadPhotosForm(Form):
-    photos = MultipleFileField(label=_(
-        'Drag and drop photos here or click to open upload dialog.'))

photo_objects/django/urls.py

@@ -9,7 +9,11 @@ urlpatterns = [
     path("_auth", api.has_permission),
     path("api/albums", api.albums),
     path("api/albums/<str:album_key>", api.album),
-    path("api/albums/<str:album_key>/photos", api.photos),
+    path(
+        "api/albums/<str:album_key>/photos",
+        api.photos,
+        name="api_photos",
+    ),
     path("api/albums/<str:album_key>/photos/<str:photo_key>", api.photo),
     path(
         "api/albums/<str:album_key>/photos/<str:photo_key>/change-requests",

photo_objects/django/views/ui/album.py

@@ -108,6 +108,7 @@ def edit_album(request: HttpRequest, album_key: str):
         reverse(
             'photo_objects:show_album',
             kwargs={"album_key": album_key}))
+    empty = album.cover_photo is None
 
     return render(
         request,
@@ -120,7 +121,10 @@ def edit_album(request: HttpRequest, album_key: str):
                 request,
                 album_key),
             "width": "narrow",
-            "preview": Preview(request, album, preview_helptext("album")),
+            "preview": Preview(
+                request,
+                album,
+                preview_helptext("album", empty)),
         })
 
 
@@ -148,12 +152,14 @@ def delete_album(request: HttpRequest, album_key: str):
             error = {'error': _(
                 'This album is managed by the system and can not be deleted.')}
 
+    empty = album.cover_photo is None
+
     return render(request, 'photo_objects/delete.html', {
         "title": "Delete album",
         "back": back,
         "photo": album.cover_photo,
         "resource": target,
         "width": "narrow",
-        "preview": Preview(request, album, preview_helptext("album")),
+        "preview": Preview(request, album, preview_helptext("album", empty)),
         **error,
     })

photo_objects/django/views/ui/photo.py

@@ -6,9 +6,8 @@ from photo_objects.django import api
 from photo_objects.django.api.utils import (
     AlbumNotFound,
     FormValidationFailed,
-    UploadPhotosFailed,
 )
-from photo_objects.django.forms import ModifyPhotoForm, UploadPhotosForm
+from photo_objects.django.forms import ModifyPhotoForm
 from photo_objects.django.models import Photo
 from photo_objects.django.views.utils import (
     BackLink,
@@ -22,40 +21,21 @@ from .utils import json_problem_as_html, preview_helptext
 
 @json_problem_as_html
 def upload_photos(request: HttpRequest, album_key: str):
-    if request.method == "POST":
-        try:
-            api.upload_photos(request, album_key)
-            return HttpResponseRedirect(
-                reverse(
-                    'photo_objects:show_album',
-                    kwargs={"album_key": album_key}))
-        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
     back = BackLink(
         target, reverse(
             'photo_objects:show_album', kwargs={
                 "album_key": album_key}))
+    empty = album.cover_photo is None
 
     return render(request, 'photo_objects/photo/upload.html', {
-        "form": form,
-        "info": info,
         "title": "Upload photos",
         "back": back,
+        "album": album,
         "photo": album.cover_photo,
         "width": "narrow",
-        "preview": Preview(request, album, preview_helptext("album")),
+        "preview": Preview(request, album, preview_helptext("album", empty)),
     })
 
 

photo_objects/django/views/ui/photo_change_request.py

@@ -7,7 +7,7 @@ from photo_objects.django.api.utils import (
     FormValidationFailed,
 )
 from photo_objects.django.forms import ReviewPhotoChangeRequestForm
-from photo_objects.django.views.utils import BackLink
+from photo_objects.django.views.utils import BackLink, Preview
 from photo_objects.utils import render_markdown
 
 from .utils import json_problem_as_html
@@ -49,13 +49,14 @@ def review_photo_change_request(request: HttpRequest, cr_id: str):
 
     back = BackLink("Albums", reverse('photo_objects:list_albums'))
 
+    helptext = render_markdown(
+        f'The current alt text for `{photo.key}` is: _"{photo.alt_text}"_.')
+
     return render(request, 'photo_objects/form.html', {
         "form": form,
         "title": "Review photo change request",
         "back": back,
         "info": info,
-        "instructions": render_markdown(
-            f'The current alt text for `{photo.key}` is: '
-            f'_"{photo.alt_text}"_.'),
         "width": "narrow",
+        "preview": Preview(request, photo, helptext),
     })

photo_objects/django/views/ui/utils.py

@@ -10,7 +10,15 @@ def json_problem_as_html(func):
     return wrapper
 
 
-def preview_helptext(resource_type: str) -> str:
+def preview_helptext(resource_type: str, empty: bool = False) -> str:
+    if resource_type == "album" and empty:
+        return (
+            f"This is an example on how the {resource_type} would appear "
+            "when sharing on social media. Upload photos and select a cover "
+            "photo to use this album specific preview instead of the server "
+            "level default preview."
+        )
+
     return (
         f"This is an example on how the {resource_type} will currently appear "
         "when sharing on social media."

{photo_objects-0.9.6.dist-info → photo_objects-0.10.0.dist-info}/METADATA

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

{photo_objects-0.9.6.dist-info → photo_objects-0.10.0.dist-info}/RECORD

@@ -8,18 +8,18 @@ photo_objects/django/admin.py,sha256=pvyQKs2FMtKtSS2PE_NKR_jsSi7-GKz3bbsqDNgjt6w
 photo_objects/django/apps.py,sha256=Apqu6o6fpoxda18NQgKupvQRvTAZxVviIK_-dUR3rck,1444
 photo_objects/django/conf.py,sha256=ZpeIulEc1tpr8AO52meNKOF30Xf5osbDtDyHvQRtkx4,2593
 photo_objects/django/context_processors.py,sha256=XacUmcYV-4NMMMNXPWrHKdvNd6lfyamisngaVerREiU,306
-photo_objects/django/forms.py,sha256=zSSmdIYn4PEx1Nnw-tuo4h4otKj3C099lB4-vp2BRUc,6861
+photo_objects/django/forms.py,sha256=HIkDRQhSMzvj0D4BdKEuEndB3bV-3NTH_h0gMRQ9UlQ,6123
 photo_objects/django/models.py,sha256=OxkkczIBg7TaFWWm4VdtbRMJOK_OQKrV29g-X2cm5BQ,7247
 photo_objects/django/objsto.py,sha256=kf-Tv-kDt47Mnx0xMolAct_lP4M0H9xg03M3BnfAnJM,6909
 photo_objects/django/signals.py,sha256=_gb4vlZkeFNYWXxwhNreaUJoOsbIWvP8OovVLtzepaE,2161
-photo_objects/django/urls.py,sha256=XnOSEB8YtAJamlEsjKYz6U1DfDu7HHZpAinpqdulR8k,2501
+photo_objects/django/urls.py,sha256=QHGjDj3XCArLtmMcP3DKp8H9Xfd2X4SEvEKmMnx2KDk,2551
 photo_objects/django/api/__init__.py,sha256=51CRTiE975ufVhvI5x-M_2D28JP8FZWyLFiuV5EaQSg,120
 photo_objects/django/api/album.py,sha256=CJDeGLCuYoxGUDcjssZRpFnToxG_KVE9Ii7NduFW2ks,2003
 photo_objects/django/api/auth.py,sha256=lS0S1tMVH2uN30g4jlixklv3eMnQ2FbQVQvuRXeMGYo,1420
 photo_objects/django/api/backup.py,sha256=lu-lDSGpEV9ASCIA5o0kNOZcg6_cmkVPCy1TFRvYyyY,6344
-photo_objects/django/api/photo.py,sha256=-lo1g6jfBr884wy-WV2DAEPxzH9V-tFUTRtitmA6i28,4471
+photo_objects/django/api/photo.py,sha256=GtrLMQAQRDQa79cAiEnYVeZ9Wr9CIpHC9ApDqAh5uiQ,2999
 photo_objects/django/api/photo_change_request.py,sha256=v94RA7SUM60tC9mIZdz8HppbNKfHWeTFNPr_BPw3pys,3075
-photo_objects/django/api/utils.py,sha256=M7GdTZAkeAWSRjZeI51dlv8qaw2CjX3ruKsa1amc1Es,5559
+photo_objects/django/api/utils.py,sha256=73yT8s5N7MtgHbIs7us7GQX3t5vOue_2-wHiUGyD81s,5394
 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
@@ -53,14 +53,14 @@ photo_objects/django/views/api/auth.py,sha256=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZR
 photo_objects/django/views/api/photo.py,sha256=WHSayWTi_wG6otq6Rz1IKqJ5ik5riclR3AWB15ge5RU,4613
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
 photo_objects/django/views/ui/__init__.py,sha256=Y3XrckZExbHpWVNwDUGLfb99_midb8-5j6Ouf_Yu_G4,128
-photo_objects/django/views/ui/album.py,sha256=EQleU9ZyF3T0OABer3YMJbUNU4Vw9q-iY3WBPN872e8,5027
+photo_objects/django/views/ui/album.py,sha256=IYjhjBj9MOffUDUSTm3IMjJoz-xGfvA_LVa0Vc_aXV8,5167
 photo_objects/django/views/ui/configuration.py,sha256=miEJTm_cRANu9Wt3SCcU-tYUwM7WLKgQm8zgApmKMxE,5464
-photo_objects/django/views/ui/photo.py,sha256=o7U0KimIWhreKSwIdVot1laEqqXprqvdbDZbRIvkJic,6966
-photo_objects/django/views/ui/photo_change_request.py,sha256=KAfk69RbDTdN3I4fMUx6j7idqZ6IHZ4li6KKVS3yAYM,2093
+photo_objects/django/views/ui/photo.py,sha256=EOu43klthhmG6ysCrw2NWb7Vcz8I3FBR6GZUFhLBLG4,6281
+photo_objects/django/views/ui/photo_change_request.py,sha256=PGP98APOVTkTw3FTvzYn92BBshensFwA8U0w8l1vIjg,2127
 photo_objects/django/views/ui/users.py,sha256=ABAtKwNoViYy2ht6X313BSm6wgvL302LVUNimp43gxc,649
-photo_objects/django/views/ui/utils.py,sha256=65hSFZ_rlWWprE5kJdqwL9P-Lwlin9qvO8GjFuajdnM,463
-photo_objects-0.9.6.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.9.6.dist-info/METADATA,sha256=onytwijT-TLdeooruS21ZT_E7q7GOoOwJPv5wm1kCzc,3615
-photo_objects-0.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.9.6.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.9.6.dist-info/RECORD,,
+photo_objects/django/views/ui/utils.py,sha256=fAEgG6cdL_u9TBLWgqQGG8zC0RX1a-9vC6C06ST7InM,823
+photo_objects-0.10.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.10.0.dist-info/METADATA,sha256=NoIKg2yngg8mybPuaHUl336sipa2ftiG7JSWJWxJzOo,3616
+photo_objects-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.10.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.10.0.dist-info/RECORD,,