photo-objects 0.0.7__py3-none-any.whl → 0.1.0__py3-none-any.whl

photo_objects/django/api/album.py

@@ -1,3 +1,6 @@
+import re
+
+from django.contrib.sites.models import Site
 from django.db.models.deletion import ProtectedError
 from django.http import HttpRequest
 
@@ -13,6 +16,24 @@ from .utils import (
 )
 
 
+def get_site_album(site: Site) -> Album:
+    album_key = f'_site_{site.id}'
+    return Album.objects.get_or_create(
+        key=album_key,
+        defaults={
+            'title': site.name,
+            'visibility': Album.Visibility.ADMIN,
+        })
+
+
+def parse_site_id(album_key: str) -> int | None:
+    key_match = re.match(r'_site_([0-9]+)', album_key)
+    if not key_match:
+        return None
+
+    return int(key_match.group(1))
+
+
 def get_albums(request: HttpRequest):
     if not request.user.is_authenticated:
         return Album.objects.filter(visibility=Album.Visibility.PUBLIC)

photo_objects/django/management/commands/create-site-albums.py

@@ -1,6 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.contrib.sites.models import Site
 
+from photo_objects.django.api.album import get_site_album
 from photo_objects.django.models import Album
 
 
@@ -11,18 +12,13 @@ class Command(BaseCommand):
         sites = Site.objects.all()
 
         for site in sites:
-            album_key = f'_site_{site.id}'
-            _, created = Album.objects.get_or_create(
-                key=album_key,
-                defaults={
-                    'visibility': Album.Visibility.ADMIN,
-                })
-
+            album, created = get_site_album(site)
             if created:
                 self.stdout.write(
                     self.style.SUCCESS(
                         f'Album for site {site.domain} created:') +
-                    f'\n  Key: {album_key}')
+                    f'\n  Key: {album.key}'
+                    f'\n  Title: {album.title}')
             else:
                 self.stdout.write(
                     self.style.NOTICE(

photo_objects/django/signals.py

@@ -1,7 +1,11 @@
+import re
+
+from django.contrib.sites.models import Site
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 
-from .models import Photo
+from .api.album import parse_site_id, get_site_album
+from .models import Album, Photo
 
 
 @receiver(post_save, sender=Photo)
@@ -56,3 +60,30 @@ def update_album_on_photo_delete(sender, **kwargs):
 
     if needs_save:
         album.save()
+
+
+@receiver(post_save, sender=Site)
+def update_album_on_site_save(sender, **kwargs):
+    site = kwargs.get('instance', None)
+    album, created = get_site_album(site)
+
+    if not created and album.title != site.name:
+        album.title = site.name
+        album.save()
+
+
+@receiver(post_save, sender=Album)
+def update_site_on_album_save(sender, **kwargs):
+    album = kwargs.get('instance', None)
+    site_id = parse_site_id(album.key)
+    if site_id is None:
+        return
+
+    try:
+        site = Site.objects.get(id=site_id)
+    except Site.DoesNotExist:
+        return
+
+    if site.name != album.title:
+        site.name = album.title
+        site.save()

photo_objects/django/tests/test_album.py

@@ -3,6 +3,7 @@ from time import sleep
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
+from django.contrib.sites.models import Site
 
 from photo_objects.django.models import Album
 from photo_objects.img import utcnow
@@ -375,3 +376,25 @@ class AlbumViewTests(TestCase):
 
         response = self.client.delete("/api/albums/copenhagen")
         self.assertStatus(response, 204)
+
+    def test_site_config_album_title_change(self):
+        site = Site.objects.get(id=1)
+        album, _ = Album.objects.get_or_create(
+            key="_site_1",
+            defaults={
+                "title": "Site 1",
+                "visibility": Album.Visibility.ADMIN,
+            }
+        )
+
+        site.name = "Changed in site"
+        site.save()
+
+        album.refresh_from_db()
+        self.assertEqual(album.title, "Changed in site")
+
+        album.title = "Changed in album"
+        album.save()
+
+        site.refresh_from_db()
+        self.assertEqual(site.name, "Changed in album")

photo_objects/django/views/ui/album.py

@@ -6,6 +6,7 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from photo_objects.django import api
+from photo_objects.django.api.album import parse_site_id
 from photo_objects.django.api.utils import FormValidationFailed
 from photo_objects.django.forms import CreateAlbumForm, ModifyAlbumForm
 from photo_objects.django.models import Album
@@ -48,12 +49,15 @@ def new_album(request: HttpRequest):
 
 
 def get_info(request: HttpRequest, album_key: str):
-    if re.match(r'_site_[0-9]+', album_key) and request.site:
+    site_id = parse_site_id(album_key)
+    if site_id is not None and request.site:
         return (
             "This is a special album for configuring site metadata for "
             f"{request.site.name}. Use album title to override the site name, "
             "albums cover photo to configure the preview image, and album "
-            "description to configure the site description.")
+            "description to configure the site description. The album title "
+            "is automatically updated when the related sites name is changed "
+            "and vice versa.")
 
 
 @json_problem_as_html

photo_objects/django/views/ui/configuration.py

@@ -44,7 +44,7 @@ def uses_https(request: HttpRequest) -> Validation:
             detail += _(
                 ' If you are running the API server behind a reverse proxy or '
                 'a load-balancer, ensure that HTTPS termination is configured '
-                f'correctly. ({request.META})')
+                f'correctly.')
 
     return Validation(
         check=_("Site is served over HTTPS"),

{photo_objects-0.0.7.dist-info → photo_objects-0.1.0.dist-info}/METADATA

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

{photo_objects-0.0.7.dist-info → photo_objects-0.1.0.dist-info}/RECORD

@@ -9,17 +9,17 @@ photo_objects/django/context_processors.py,sha256=DLhLZHAvGlrpxYegaLiKEx9X7rpyZU
 photo_objects/django/forms.py,sha256=VoDlyZAwiTLyNxW3rRk5bzjfPJvNuKV-wpuLGCe5TCY,6505
 photo_objects/django/models.py,sha256=tRHBqswASWMnyz8rwiKsmHDqEvQX54ly9k8tvU7qNOM,4597
 photo_objects/django/objsto.py,sha256=GZuoPZ1I5qX4rwEYZlOfZZiV4NQ19iknQBT6755421Y,2417
-photo_objects/django/signals.py,sha256=Q_Swjl_9z6B6zP-97D_ep5zGSAEgmQfwUz0utMDY93A,1624
+photo_objects/django/signals.py,sha256=NEh_pfvsSt2f7MuHIJE0uLHUkqjKH4ipAFS7tmvm9LI,2400
 photo_objects/django/urls.py,sha256=safcovG-8G60F_1v31ZvCCtBE8d6sHUtma6d5ZQHymo,2356
 photo_objects/django/api/__init__.py,sha256=BnEHlm3mwyBy-1xhk-NFasgZa4fjCDjtfkBUoH0puPY,62
-photo_objects/django/api/album.py,sha256=ZH8WfEoZ52L_ucMvCaccXf1lU7IrSgtub2sWEMrMpQs,1993
+photo_objects/django/api/album.py,sha256=c5qDvy6ebIZCzggxcYgSgLBR0cco79V47nJf2OHuBj8,2486
 photo_objects/django/api/auth.py,sha256=LfMm02_TKwrP5XFie-KzBnW3FNFWQAafBlu0UE19Gd4,1370
 photo_objects/django/api/photo.py,sha256=NGCg_Qd4X9NAd7t6lqByK9JGsoTq8HKkyEr-HwMCimI,3838
 photo_objects/django/api/utils.py,sha256=DgAsbvLLZxck_D6AXLsvUXJ3OguLufZ8sadmsToenJ4,5245
 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/create-initial-admin-account.py,sha256=M4qv1d_qFSGy_lDcKbyKOmfGsQt8i16Zoit9cJ6PwAU,1099
-photo_objects/django/management/commands/create-site-albums.py,sha256=t0g1hKVFHoZJoJayGOZUqJaR_z-Bdyt9Ut4ETpOaRjI,1036
+photo_objects/django/management/commands/create-site-albums.py,sha256=mz99RfmczM0x7zuVRabReq4uBZXN-2Ow7VoNWARvBig,959
 photo_objects/django/migrations/0001_initial.py,sha256=BLW-EZ38sBgDhOYyprc-h_vuPpRxA11qxt4ZuYNO1Wo,2424
 photo_objects/django/migrations/0002_created_at_updated_at.py,sha256=7OT2VvDffAkX9XKBHVY-jvzxeIl2yU0Jr1ByCNGcUfw,1039
 photo_objects/django/migrations/0003_admin_visibility.py,sha256=PdxPOJzr-ViRBlOYUHEEGhe0hLtDysZJdMqvbjKVpEg,529
@@ -28,7 +28,7 @@ photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 photo_objects/django/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/templatetags/photo_objects_extras.py,sha256=LjqvVZpcVqdEQQ-EgC7OkEv2DqIvmfmDC-EsQNmkY7M,1205
 photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-photo_objects/django/tests/test_album.py,sha256=eforhWjaL3ZD7aENrjzbVhXHLI9WpY8pGZRXkgF7yNw,13333
+photo_objects/django/tests/test_album.py,sha256=qeRx_M8EvY9n_as1x8-EWtp9Ob1kOPGnUfZuUnMfDO4,13979
 photo_objects/django/tests/test_auth.py,sha256=su00EypNzGQcvxqhmOtFevZriK31pY7yD1HxpQFcUT4,3928
 photo_objects/django/tests/test_photo.py,sha256=SpQsVynzJLP2F9qYrvZMzCBSiHvsRDpOZ8-W_07K_q8,13386
 photo_objects/django/tests/test_utils.py,sha256=DkhzDtZqu5OXg-IKzqHz2GY0sFS8RbwYC3w81RuPxS4,1259
@@ -41,12 +41,12 @@ photo_objects/django/views/api/auth.py,sha256=N53csbthH0DEMFjY3fqhtLmtdL7xqzkatk
 photo_objects/django/views/api/photo.py,sha256=52UMP1r6TN_xfu8fHE25yOUiTa6W1F2XbgEichM8tTE,3526
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
 photo_objects/django/views/ui/__init__.py,sha256=vbFXPj5liue-M_CXQGP5PKhD98Z5ev53yKLPU8zWpUs,71
-photo_objects/django/views/ui/album.py,sha256=bgFPg9ipkQFqZK7cQgYT9gqpUgdSJ_1NTHlszsfclKU,5010
-photo_objects/django/views/ui/configuration.py,sha256=bkckPtQHf7FYwEUIemtMTA1jaDHi7B7VA4ucO_4qt5E,5593
+photo_objects/django/views/ui/album.py,sha256=80fkAdtXjgBqq-4e1i2slnzWD2C-m6rc02piIqYlgmI,5215
+photo_objects/django/views/ui/configuration.py,sha256=pzNRHq3FSrVCTx2R31_FW3A3aJxzEO4pDnXsOVS75uA,5576
 photo_objects/django/views/ui/photo.py,sha256=4NJSN5X_NcVcUEPaoGEGmXRDAgI5_KsOlHr7j-yo2QY,6040
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.0.7.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.0.7.dist-info/METADATA,sha256=xYOJTlRMBdsnYh_0AHAzGcHybbiUodE4SY8Xvc0E85g,3671
-photo_objects-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.0.7.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.0.7.dist-info/RECORD,,
+photo_objects-0.1.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.1.0.dist-info/METADATA,sha256=o0IEDnYB7mXHUO3cT2i-yCDCkfS01DoT8OW32U4tOxU,3671
+photo_objects-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.1.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.1.0.dist-info/RECORD,,