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

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

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

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from .models import Album, Photo
+from .models import Album, Photo, SiteSettings
 
 admin.site.register(Album)
 admin.site.register(Photo)
+admin.site.register(SiteSettings)

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/api/album.py

@@ -1,6 +1,3 @@
-import re
-
-from django.contrib.sites.models import Site
 from django.db.models.deletion import ProtectedError
 from django.http import HttpRequest
 
@@ -16,24 +13,6 @@ from .utils import (
 )
 
 
-def get_site_album(site: Site) -> tuple[Album, bool]:
-    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-0.5.0/photo_objects/django/migrations/0005_sitesettings.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2 on 2025-08-26 18:39
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photo_objects', '0004_camera_setup_and_settings'),
+        ('sites', '0002_alter_domain_unique'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SiteSettings',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.TextField(blank=True)),
+                ('preview_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='photo_objects.photo')),
+                ('site', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='settings', to='sites.site')),
+            ],
+            options={
+                'verbose_name_plural': 'site settings',
+            },
+        ),
+    ]

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/models.py

@@ -1,4 +1,6 @@
 from django.db import models
+from django.db.models.signals import pre_delete, pre_save
+from django.contrib.sites.models import Site
 from django.core.validators import RegexValidator
 from django.utils.translation import gettext_lazy as _
 
@@ -146,3 +148,43 @@ class Photo(BaseModel):
             exposure_time=self.exposure_time,
             iso_speed=self.iso_speed,
         )
+
+
+SETTINGS_CACHE = {}
+
+
+class SiteSettingsManager(models.Manager):
+    def get(self, site: Site):
+        cached = SETTINGS_CACHE.get(site.id)
+        if cached:
+            return cached
+        settings, _ = self.get_or_create(site=site)
+        SETTINGS_CACHE[site.id] = settings
+        return settings
+
+
+class SiteSettings(models.Model):
+    class Meta:
+        verbose_name_plural = "site settings"
+
+    site = models.OneToOneField(
+        Site, on_delete=models.CASCADE, related_name="settings")
+
+    description = models.TextField(blank=True)
+    preview_image = models.ForeignKey(
+        Photo, blank=True, null=True, on_delete=models.SET_NULL)
+
+    objects = SiteSettingsManager()
+
+    def __str__(self):
+        return f"Settings for {self.site.name}"
+
+
+def clear_cached_settings(sender, **kwargs):
+    site_id = kwargs.get("instance").site.id
+    if site_id in SETTINGS_CACHE:
+        del SETTINGS_CACHE[site_id]
+
+
+pre_save.connect(clear_cached_settings, sender=SiteSettings)
+pre_delete.connect(clear_cached_settings, sender=SiteSettings)

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/signals.py

@@ -1,9 +1,7 @@
-from django.contrib.sites.models import Site
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 
-from .api.album import parse_site_id, get_site_album
-from .models import Album, Photo
+from .models import Photo
 
 
 @receiver(post_save, sender=Photo)
@@ -58,30 +56,3 @@ 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-0.4.1 → photo_objects-0.5.0}/photo_objects/django/templatetags/photo_objects_extras.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from django import template
 
-from photo_objects.django.api.album import get_site_album
+from photo_objects.django.models import SiteSettings
 from photo_objects.django.views.utils import meta_description
 
 
@@ -48,13 +48,14 @@ def meta_og(context):
     try:
         request = context.get("request")
         site = request.site
-        album, _ = get_site_album(site)
+
+        settings = SiteSettings.objects.get(site)
 
         return {
             'request': request,
-            "title": album.title or site.name,
-            "description": meta_description(request, album.description),
-            "photo": album.cover_photo,
+            "title": site.name,
+            "description": meta_description(request, settings.description),
+            "photo": settings.preview_image,
         }
     except Exception:
         return context

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/tests/test_album.py

@@ -3,7 +3,6 @@ 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
@@ -376,25 +375,3 @@ 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-0.4.1 → photo_objects-0.5.0}/photo_objects/django/views/ui/album.py

@@ -4,7 +4,6 @@ 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
@@ -51,15 +50,7 @@ def new_album(request: HttpRequest):
 
 
 def get_info(request: HttpRequest, album_key: str):
-    site_id = parse_site_id(album_key)
-    if site_id is not None and request.site:
-        return render_markdown(
-            "This is a special album for configuring site metadata for "
-            f"**{request.site.name}**. Use album title to change the site "
-            "name, albums cover photo to configure the preview image, and "
-            "album description to configure the site description. The album "
-            "title is automatically updated when the related sites name is "
-            "changed and vice versa.")
+    # TODO: Remove this later if not needed
     return None
 
 

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/views/ui/configuration.py

@@ -5,7 +5,7 @@ from django.shortcuts import render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from photo_objects.django.models import Album
+from photo_objects.django.api.utils import JsonProblem
 from photo_objects.django.views.utils import BackLink, render_markdown
 
 from .utils import json_problem_as_html
@@ -108,25 +108,20 @@ def domain_matches_request(request: HttpRequest) -> Validation:
     )
 
 
-def site_preview_configured(
-        request: HttpRequest,
-        album: Album | Exception) -> Validation:
+def site_preview_configured(request: HttpRequest) -> Validation:
     detail = None
 
-    if isinstance(album, Exception):
-        ok = False
-        detail = f'Failed to resolve site or album: `{str(album)}`'
+    ok = request.site.settings.preview_image is not None
+    if ok:
+        detail = (
+            f'The site settings for `{request.site.domain}` configure a '
+            'preview image.'
+        )
     else:
-        ok = album.cover_photo is not None
-        if ok:
-            detail = (
-                f'The `{album.key}` album has a cover photo configured. This '
-                'photo will be used as the site preview image.'
-            )
-        else:
-            detail = (
-                f'Set cover photo for `{album.key}` album to configure '
-                'the preview image.')
+        detail = (
+            'Configure a preview image in site settings for '
+            f'`{request.site.domain}`.'
+        )
 
     return Validation(
         check=_("Site has a default preview image"),
@@ -135,25 +130,21 @@ def site_preview_configured(
     )
 
 
-def site_description_configured(
-        request: HttpRequest,
-        album: Album | Exception) -> Validation:
+def site_description_configured(request: HttpRequest) -> Validation:
     detail = None
 
-    if isinstance(album, Exception):
-        ok = False
-        detail = f'Failed to resolve site or album: `{str(album)}`'
+    settings = request.site.settings
+    ok = settings.description is not None and len(settings.description) > 0
+    if ok:
+        detail = (
+            f'The site settings for `{request.site.domain}` configure a '
+            'description.'
+        )
     else:
-        ok = album.description is not None and len(album.description) > 0
-        if ok:
-            detail = (
-                f'The `{album.key}` album has a description. This description '
-                'will be used as the site description.'
-            )
-        else:
-            detail = (
-                f'Set description for `{album.key}` album to configure '
-                'the site description.')
+        detail = (
+            'Configure a description in site settings for '
+            f'`{request.site.domain}`.'
+        )
 
     return Validation(
         check=_("Site has a default description"),
@@ -164,19 +155,15 @@ def site_description_configured(
 
 @json_problem_as_html
 def configuration(request: HttpRequest):
-    try:
-        site_id = request.site.id
-        album_key = f"_site_{site_id}"
-        album = Album.objects.get(key=album_key)
-    except Exception as e:
-        album = e
+    if not request.user.is_staff:
+        raise JsonProblem("Page not found", status=404)
 
     validations = [
         uses_https(request),
         site_is_configured(request),
         domain_matches_request(request),
-        site_preview_configured(request, album),
-        site_description_configured(request, album),
+        site_preview_configured(request),
+        site_description_configured(request),
     ]
 
     back = BackLink("Back to albums", reverse('photo_objects:list_albums'))

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects/django/views/ui/users.py

@@ -2,18 +2,18 @@ from django.contrib.auth import views as auth_views
 from django.http import HttpRequest
 from django.urls import reverse_lazy
 
-from photo_objects.django.api.album import get_site_album
+from photo_objects.django.models import SiteSettings
 from photo_objects.django.views.utils import BackLink
 
 
 def login(request: HttpRequest):
-    album, _ = get_site_album(request.site)
+    settings = SiteSettings.objects.get(request.site)
 
     return auth_views.LoginView.as_view(
         template_name="photo_objects/form.html",
         extra_context={
             "title": "Login",
-            "photo": album.cover_photo,
+            "photo": settings.preview_image,
             "action": "Login",
             "back": BackLink(
                 'Back to albums',

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

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

{photo_objects-0.4.1 → photo_objects-0.5.0}/photo_objects.egg-info/SOURCES.txt

@@ -30,11 +30,11 @@ photo_objects/django/management/__init__.py
 photo_objects/django/management/commands/__init__.py
 photo_objects/django/management/commands/clean-scaled-photos.py
 photo_objects/django/management/commands/create-initial-admin-account.py
-photo_objects/django/management/commands/create-site-albums.py
 photo_objects/django/migrations/0001_initial.py
 photo_objects/django/migrations/0002_created_at_updated_at.py
 photo_objects/django/migrations/0003_admin_visibility.py
 photo_objects/django/migrations/0004_camera_setup_and_settings.py
+photo_objects/django/migrations/0005_sitesettings.py
 photo_objects/django/migrations/__init__.py
 photo_objects/django/templatetags/__init__.py
 photo_objects/django/templatetags/photo_objects_extras.py

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

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

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

@@ -1,28 +0,0 @@
-# pylint: disable=invalid-name
-from django.core.management.base import BaseCommand
-from django.contrib.sites.models import Site
-
-from photo_objects.django.api.album import get_site_album
-
-
-class Command(BaseCommand):
-    help = "Create albums for configuring site metadata."
-
-    def handle(self, *args, **options):
-        sites = Site.objects.all()
-
-        for site in sites:
-            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  Title: {album.title}')
-            else:
-                self.stdout.write(
-                    self.style.NOTICE(
-                        f'Album creation for site {site.domain} skipped: '
-                        'Album already exists.'
-                    )
-                )