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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.4.0
+Version: 0.5.0
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License
@@ -74,7 +74,7 @@ autopep8 -aaar --in-place --exclude back/api/settings.py,*/migrations/*.py back
 Run static analysis with:
 
 ```sh
-pylint -E --enable=invalid-name,unused-import,useless-object-inheritance back/api photo_objects
+pylint back/api photo_objects
 ```
 
 ### Integration tests

{photo_objects-0.4.0 → photo_objects-0.5.0}/README.md

@@ -26,7 +26,7 @@ autopep8 -aaar --in-place --exclude back/api/settings.py,*/migrations/*.py back
 Run static analysis with:
 
 ```sh
-pylint -E --enable=invalid-name,unused-import,useless-object-inheritance back/api photo_objects
+pylint back/api photo_objects
 ```
 
 ### Integration tests

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/config.py

@@ -29,3 +29,9 @@ def get_secret_key() -> str:
     write_to_home_directory("secret_key", key)
 
     return key
+
+
+def add_port_to_host(url: str, port: str | None) -> str:
+    if port:
+        return f"{url}:{port}"
+    return url

{photo_objects-0.4.0 → 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.0 → 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) -> 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)
@@ -89,4 +68,4 @@ def delete_album(request: HttpRequest, album_key: str):
             f"Album with {album_key} key can not be deleted because it "
             "contains photos.",
             409,
-        )
+        ) from None

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/api/auth.py

@@ -16,7 +16,7 @@ def check_album_access(request: HttpRequest, album_key: str):
     try:
         album = Album.objects.get(key=album_key)
     except Album.DoesNotExist:
-        raise AlbumNotFound(album_key)
+        raise AlbumNotFound(album_key) from None
 
     if not request.user.is_authenticated:
         if album.visibility == Album.Visibility.PRIVATE:
@@ -37,12 +37,12 @@ def check_photo_access(
     try:
         size = PhotoSize(size_key)
     except ValueError:
-        raise InvalidSize(size_key)
+        raise InvalidSize(size_key) from None
 
     try:
         photo = Photo.objects.get(key=join_key(album_key, photo_key))
     except Photo.DoesNotExist:
-        raise PhotoNotFound(album_key, photo_key)
+        raise PhotoNotFound(album_key, photo_key) from None
 
     if not request.user.is_authenticated:
         if photo.album.visibility == Album.Visibility.PRIVATE:

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/api/photo.py

@@ -36,7 +36,7 @@ def _upload_photo(album_key: str, photo_file: UploadedFile):
         raise JsonProblem(
             "Could not open photo file.",
             400,
-        )
+        ) from None
 
     f = CreatePhotoForm(dict(
         key=f"{album_key}/{slugify(photo_file.name)}",
@@ -59,7 +59,7 @@ def _upload_photo(album_key: str, photo_file: UploadedFile):
         msg = objsto.with_error_code(
             "Could not save photo to object storage", e)
         logger.error(f"{msg}: {str(e)}")
-        raise JsonProblem(f"{msg}.", 500)
+        raise JsonProblem(f"{msg}.", 500) from e
 
     return photo
 
@@ -125,11 +125,11 @@ def delete_photo(request: HttpRequest, album_key: str, photo_key: str):
         msg = objsto.with_error_code(
             "Could not delete photo from object storage", e)
         logger.error(f"{msg}: {str(e)}")
-        raise JsonProblem("{msg}.", 500)
+        raise JsonProblem(f"{msg}.", 500) from e
 
     try:
         photo.delete()
     except Exception as e:
         msg = "Could not delete photo from database"
         logger.error(f"{msg}: {str(e)}")
-        raise JsonProblem(f"{msg}.", 500)
+        raise JsonProblem(f"{msg}.", 500) from e

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/api/utils.py

@@ -50,7 +50,7 @@ class JsonProblem(PhotoObjectsError):
         return render(request, "photo_objects/problem.html", {
             "title": "Error",
             "back": BackLink(
-                f'Back to albums',
+                'Back to albums',
                 reverse_lazy('photo_objects:list_albums')),
             "problem_title": self.title,
             "status": self.status
@@ -153,7 +153,7 @@ def parse_json_body(request: HttpRequest):
         raise JsonProblem(
             "Could not parse JSON data from request body.",
             400,
-        )
+        ) from None
 
 
 def parse_input_data(request: HttpRequest):

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/forms.py

@@ -23,9 +23,9 @@ KEY_POSTFIX_CHARS = 'bcdfghjklmnpqrstvwxz2456789'
 KEY_POSTFIX_LEN = 5
 
 
-def slugify(input: str, lower=False, replace_leading_underscores=False) -> str:
+def slugify(title: str, lower=False, replace_leading_underscores=False) -> str:
     key = unicodedata.normalize(
-        'NFKD', input).encode(
+        'NFKD', title).encode(
         'ascii', 'ignore').decode('ascii')
     if lower:
         key = key.lower()

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/management/commands/clean-scaled-photos.py

@@ -1,3 +1,4 @@
+# pylint: disable=invalid-name
 from django.core.management.base import BaseCommand
 
 from photo_objects.utils import pretty_list

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/management/commands/create-initial-admin-account.py

@@ -1,6 +1,8 @@
+# pylint: disable=invalid-name
+from secrets import token_urlsafe
+
 from django.core.management.base import BaseCommand
 from django.contrib.auth import get_user_model
-from secrets import token_urlsafe
 
 from photo_objects.config import write_to_home_directory
 
@@ -9,13 +11,13 @@ class Command(BaseCommand):
     help = "Create initial admin user account."
 
     def handle(self, *args, **options):
-        User = get_user_model()
-        superuser_count = User.objects.filter(is_superuser=True).count()
+        user = get_user_model()
+        superuser_count = user.objects.filter(is_superuser=True).count()
 
         if superuser_count == 0:
             username = 'admin'
             password = token_urlsafe(32)
-            User.objects.create_superuser(username, password=password)
+            user.objects.create_superuser(username, password=password)
 
             write_to_home_directory("initial_admin_password", password)
 

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.0 → 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.0 → photo_objects-0.5.0}/photo_objects/django/signals.py

@@ -1,11 +1,7 @@
-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 .api.album import parse_site_id, get_site_album
-from .models import Album, Photo
+from .models import Photo
 
 
 @receiver(post_save, sender=Photo)
@@ -60,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.0 → photo_objects-0.5.0}/photo_objects/django/templatetags/photo_objects_extras.py

@@ -1,7 +1,8 @@
 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
 
 
 register = template.Library()
@@ -47,13 +48,14 @@ def meta_og(context):
     try:
         request = context.get("request")
         site = request.site
-        album = get_site_album(site.id)
+
+        settings = SiteSettings.objects.get(site)
 
         return {
             'request': request,
-            "title": album.title or site.name,
-            "description": 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.0 → 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
@@ -22,9 +21,9 @@ PHOTOS_DIRECTORY = "photos"
 class ViewVisibilityTests(TestCase):
     @classmethod
     def setUpTestData(cls):
-        User = get_user_model()
-        User.objects.create_user(username='test-visibility', password='test')
-        User.objects.create_user(
+        user = get_user_model()
+        user.objects.create_user(username='test-visibility', password='test')
+        user.objects.create_user(
             username='test-staff-visibility',
             password='test',
             is_staff=True)
@@ -91,16 +90,16 @@ class ViewVisibilityTests(TestCase):
 
 class AlbumViewTests(TestCase):
     def setUp(self):
-        User = get_user_model()
-        User.objects.create_user(username='no_permission', password='test')
+        user = get_user_model()
+        user.objects.create_user(username='no_permission', password='test')
 
-        User.objects.create_user(
+        user.objects.create_user(
             username='superuser',
             password='test',
             is_staff=True,
             is_superuser=True)
 
-        has_permission = User.objects.create_user(
+        has_permission = user.objects.create_user(
             username='has_permission', password='test')
         permissions = [
             'add_album',
@@ -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.0 → photo_objects-0.5.0}/photo_objects/django/tests/test_auth.py

@@ -12,8 +12,8 @@ def _path_fn(album, photo):
 class AuthViewTests(TestCase):
     @classmethod
     def setUpTestData(cls):
-        User = get_user_model()
-        User.objects.create_user(username='test-auth', password='test')
+        user = get_user_model()
+        user.objects.create_user(username='test-auth', password='test')
 
         public_album = Album.objects.create(
             key="test-auth-public", visibility=Album.Visibility.PUBLIC)

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/tests/test_commands.py

@@ -2,9 +2,7 @@ from io import StringIO
 
 from django.contrib.auth import get_user_model
 from django.core.management import call_command
-from minio import S3Error
 
-from photo_objects.django import objsto
 from photo_objects.django.conf import CONFIGURABLE_PHOTO_SIZES
 from photo_objects.django.models import Album
 
@@ -13,8 +11,8 @@ from .utils import TestCase, open_test_photo
 
 class PhotoViewTests(TestCase):
     def setUp(self):
-        User = get_user_model()
-        User.objects.create_user(
+        user = get_user_model()
+        user.objects.create_user(
             username='superuser',
             password='test',
             is_staff=True,
@@ -30,36 +28,6 @@ class PhotoViewTests(TestCase):
                 f"/api/albums/{album_key}/photos/{photo_key}/img?size={size}")
             self.assertStatus(response, 200)
 
-    def assertPhotoFound(self, album_key, photo_key, sizes):
-        if not isinstance(sizes, list):
-            sizes = [sizes]
-
-        for size in sizes:
-            try:
-                objsto.get_photo(album_key, photo_key, size)
-            except S3Error as e:
-                if e.code == "NoSuchKey":
-                    raise AssertionError(
-                        f"Photo not found: {size}/{album_key}/{photo_key}")
-                else:
-                    raise e
-
-    def assertPhotoNotFound(self, album_key, photo_key, sizes):
-        if not isinstance(sizes, list):
-            sizes = [sizes]
-
-        for size in sizes:
-            with self.assertRaises(
-                S3Error,
-                msg=f"Photo found: {size}/{album_key}/{photo_key}"
-            ) as e:
-                objsto.get_photo(album_key, photo_key, size)
-
-            self.assertEqual(
-                e.exception.code,
-                "NoSuchKey",
-                f"Photo not found: {size}/{album_key}/{photo_key}")
-
     def test_clean_scaled_photos(self):
         login_success = self.client.login(
             username='superuser', password='test')
@@ -73,23 +41,23 @@ class PhotoViewTests(TestCase):
         self.assertStatus(response, 201)
 
         self._scale_image("test-photo-sizes", "tower.jpg")
-        self.assertPhotoFound("test-photo-sizes",
-                              "tower.jpg", ["sm", "md", "lg", "og"])
+        self.assertPhotoInObjsto(
+            "test-photo-sizes", "tower.jpg", ["sm", "md", "lg", "og"])
 
         out = StringIO()
         call_command('clean-scaled-photos', stdout=out)
         output = out.getvalue()
         self.assertIn("No previous photo sizes configuration found", output)
         self.assertIn("Total deleted photos: 3", output)
-        self.assertPhotoNotFound(
+        self.assertPhotoNotInObjsto(
             "test-photo-sizes",
             "tower.jpg",
             CONFIGURABLE_PHOTO_SIZES)
-        self.assertPhotoFound("test-photo-sizes", "tower.jpg", "og")
+        self.assertPhotoInObjsto("test-photo-sizes", "tower.jpg", "og")
 
         self._scale_image("test-photo-sizes", "tower.jpg")
-        self.assertPhotoFound("test-photo-sizes",
-                              "tower.jpg", ["sm", "md", "lg", "og"])
+        self.assertPhotoInObjsto(
+            "test-photo-sizes", "tower.jpg", ["sm", "md", "lg", "og"])
 
         with self.settings(PHOTO_OBJECTS_PHOTO_SIZES=dict(
             sm=dict(max_width=256, max_height=256),
@@ -101,12 +69,12 @@ class PhotoViewTests(TestCase):
                 "Found changes in photo sizes configuration for sm sizes.",
                 output)
             self.assertIn("Total deleted photos: 1", output)
-            self.assertPhotoNotFound("test-photo-sizes", "tower.jpg", "sm")
-            self.assertPhotoFound("test-photo-sizes",
-                                  "tower.jpg", ["md", "lg", "og"])
+            self.assertPhotoNotInObjsto("test-photo-sizes", "tower.jpg", "sm")
+            self.assertPhotoInObjsto(
+                "test-photo-sizes", "tower.jpg", ["md", "lg", "og"])
 
         response = self.client.delete(
             "/api/albums/test-photo-sizes/photos/tower.jpg")
         self.assertStatus(response, 204)
-        self.assertPhotoNotFound(
+        self.assertPhotoNotInObjsto(
             "test-photo-sizes", "tower.jpg", ["sm", "md", "lg", "og"])

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/tests/test_img.py

@@ -16,10 +16,10 @@ class ImgTests(TestCase):
             ((1000, 1000), (512, 512)),
         ]
 
-        for input, expected in testdata:
-            with self.subTest(w=input[0], h=input[1]):
+        for size, expected in testdata:
+            with self.subTest(w=size[0], h=size[1]):
                 original = BytesIO()
-                image = Image.new("RGB", input, color="red")
+                image = Image.new("RGB", size, color="red")
                 image.save(original, format="JPEG")
                 original.seek(0)
 

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/tests/test_photo.py

@@ -18,10 +18,10 @@ from .utils import TestCase, open_test_photo, parse_timestamps
 
 class PhotoViewTests(TestCase):
     def setUp(self):
-        User = get_user_model()
-        User.objects.create_user(username='no_permission', password='test')
+        user = get_user_model()
+        user.objects.create_user(username='no_permission', password='test')
 
-        has_permission = User.objects.create_user(
+        has_permission = user.objects.create_user(
             username='has_permission', password='test')
         permissions = [
             'add_photo',

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/tests/test_utils.py

@@ -1,9 +1,11 @@
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from minio import S3Error
 
 from photo_objects.django import objsto
 from photo_objects.django.forms import slugify
+from photo_objects.django.views.utils import meta_description
 
 
 class TestUtils(TestCase):
@@ -16,9 +18,9 @@ class TestUtils(TestCase):
             ("album__photo_-key", "album-photo-key"),
         ]
 
-        for input, expected in checks:
-            with self.subTest(input=input, expected=expected):
-                self.assertEqual(slugify(input), expected)
+        for title, expected in checks:
+            with self.subTest(input=title, expected=expected):
+                self.assertEqual(slugify(title), expected)
 
     def test_slugify_lower(self):
         self.assertEqual(slugify("QwErTy!", True), "qwerty-")
@@ -41,3 +43,22 @@ class TestUtils(TestCase):
             objsto.with_error_code("Failed", e),
             "Failed (Test)",
         )
+
+    def test_meta_description(self):
+        md_multi_p = (
+            "Description with **bold** and *italics*...\n\n"
+            "...and multiple paragraphs")
+        testdata = [
+            ("Plain text description",
+             "Plain text description"),
+            (md_multi_p,
+             "Description with bold and italics..."),
+            (None,
+             "A simple self-hosted photo server."),
+        ]
+
+        for description, expected in testdata:
+            with self.subTest(expected=expected):
+                self.assertEqual(
+                    meta_description(MagicMock(), description),
+                    expected)

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/tests/utils.py

@@ -5,7 +5,9 @@ from django.conf import settings
 from django.test import TestCase as DjangoTestCase, override_settings
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
+from minio import S3Error
 
+from photo_objects.django import objsto
 from photo_objects.django.models import Album, Photo
 from photo_objects.django.objsto import _objsto_access
 
@@ -38,8 +40,9 @@ def _objsto_test_settings():
 
 @override_settings(PHOTO_OBJECTS_OBJSTO=_objsto_test_settings())
 class TestCase(DjangoTestCase):
+    # pylint: disable=invalid-name
     @classmethod
-    def tearDownClass(_):
+    def tearDownClass(cls):
         client, bucket = _objsto_access()
 
         for i in client.list_objects(bucket, recursive=True):
@@ -47,6 +50,37 @@ class TestCase(DjangoTestCase):
 
         client.remove_bucket(bucket)
 
+    def assertPhotoInObjsto(self, album_key, photo_key, sizes):
+        if not isinstance(sizes, list):
+            sizes = [sizes]
+
+        for size in sizes:
+            try:
+                objsto.get_photo(album_key, photo_key, size)
+            except S3Error as e:
+                if e.code == "NoSuchKey":
+                    raise AssertionError(
+                        f"Photo not found: {size}/{album_key}/{photo_key}"
+                    ) from None
+                else:
+                    raise e
+
+    def assertPhotoNotInObjsto(self, album_key, photo_key, sizes):
+        if not isinstance(sizes, list):
+            sizes = [sizes]
+
+        for size in sizes:
+            with self.assertRaises(
+                S3Error,
+                msg=f"Photo found: {size}/{album_key}/{photo_key}"
+            ) as e:
+                objsto.get_photo(album_key, photo_key, size)
+
+            self.assertEqual(
+                e.exception.code,
+                "NoSuchKey",
+                f"Photo not found: {size}/{album_key}/{photo_key}")
+
     def assertTimestampLess(self, a, b, **kwargs):
         '''Assert a is less than b. Automatically parses strings to datetime
         objects.

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/urls.py

@@ -1,9 +1,8 @@
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponseRedirect
-from django.urls import path, reverse_lazy
+from django.urls import path
 
 from .views import api, ui
-from .views.utils import BackLink
 
 app_name = "photo_objects"
 urlpatterns = [

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/views/api/photo.py

@@ -82,7 +82,7 @@ def get_img(request: HttpRequest, album_key: str, photo_key: str):
                 album_key, photo_key, PhotoSize.ORIGINAL.value)
         except (S3Error, HTTPError) as e:
             msg = objsto.with_error_code(
-                f"Could not fetch photo from object storage", e)
+                "Could not fetch photo from object storage", e)
             logger.error(f"{msg}: {str(e)}")
 
             code = objsto.get_error_code(e)

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/django/views/ui/album.py

@@ -1,16 +1,17 @@
-import re
-
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import render
 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
-from photo_objects.django.views.utils import BackLink, render_markdown
+from photo_objects.django.views.utils import (
+    BackLink,
+    meta_description,
+    render_markdown,
+)
 
 from .utils import json_problem_as_html
 
@@ -49,15 +50,8 @@ 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
 
 
 @json_problem_as_html
@@ -75,7 +69,7 @@ def show_album(request: HttpRequest, album_key: str):
         "album": album,
         "photos": photos,
         "title": album.title or album.key,
-        "description": album.description,
+        "description": meta_description(request, album),
         "back": back,
         "details": details,
         "photo": album.cover_photo,
@@ -147,7 +141,7 @@ def delete_album(request: HttpRequest, album_key: str):
                 'This album is managed by the system and can not be deleted.')}
 
     return render(request, 'photo_objects/delete.html', {
-        "title": f"Delete album",
+        "title": "Delete album",
         "back": back,
         "photo": album.cover_photo,
         "resource": target,

{photo_objects-0.4.0 → 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
@@ -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.')
+                'correctly.')
 
     return Validation(
         check=_("Site is served over HTTPS"),
@@ -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.0 → photo_objects-0.5.0}/photo_objects/django/views/ui/photo.py

@@ -6,7 +6,11 @@ from photo_objects.django import api
 from photo_objects.django.api.utils import AlbumNotFound, FormValidationFailed
 from photo_objects.django.forms import ModifyPhotoForm, UploadPhotosForm
 from photo_objects.django.models import Photo
-from photo_objects.django.views.utils import BackLink, render_markdown
+from photo_objects.django.views.utils import (
+    BackLink,
+    meta_description,
+    render_markdown,
+)
 
 from .utils import json_problem_as_html
 
@@ -40,8 +44,8 @@ def upload_photos(request: HttpRequest, album_key: str):
     })
 
 
-def _lower(input: str):
-    return input.lower() if input else ''
+def _lower(value: str):
+    return value.lower() if value else ''
 
 
 def _camera(photo: Photo):
@@ -128,7 +132,7 @@ def show_photo(request: HttpRequest, album_key: str, photo_key: str):
         "previous_filename": previous_filename,
         "next_filename": next_filename,
         "title": photo.title or photo.filename,
-        "description": photo.description,
+        "description": meta_description(request, photo),
         "back": back,
         "details": details,
     })

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

@@ -2,21 +2,21 @@ 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(
-                f'Back to albums',
+                'Back to albums',
                 reverse_lazy('photo_objects:list_albums')),
             "class": "login"
         },

photo_objects-0.5.0/photo_objects/django/views/utils.py

@@ -0,0 +1,60 @@
+from xml.etree import ElementTree as ET
+
+from django.http import HttpRequest
+from django.utils.dateformat import format as format_date
+from django.utils.safestring import mark_safe
+from markdown import markdown
+
+from photo_objects.django.models import Album, Photo
+
+
+class BackLink:
+    def __init__(self, text, url):
+        self.text = text
+        self.url = url
+
+
+def render_markdown(value):
+    return mark_safe(markdown(value))
+
+
+def _first_paragraph_textcontent(raw) -> str | None:
+    html = render_markdown(raw)
+    root = ET.fromstring(f"<root>{html}</root>")
+
+    first = root.find("p")
+    if first is None:
+        return None
+
+    return ''.join(first.itertext())
+
+
+def _default_album_description(request: HttpRequest, album: Album) -> str:
+    count = album.photo_set.count()
+    plural = 's' if count != 1 else ''
+    return f"Album with {count} photo{plural} in {request.site.name}."
+
+
+def _default_photo_description(photo: Photo) -> str:
+    date_str = format_date(photo.timestamp, "F Y")
+    return f"Photo from {date_str} in {photo.album.title} album."
+
+
+def meta_description(
+        request: HttpRequest,
+        resource: Album | Photo | str | None) -> str:
+    text = None
+    if isinstance(resource, Album):
+        text = (
+            _first_paragraph_textcontent(resource.description) or
+            _default_album_description(request, resource))
+
+    if isinstance(resource, Photo):
+        text = (
+            _first_paragraph_textcontent(resource.description) or
+            _default_photo_description(resource))
+
+    if isinstance(resource, str):
+        text = _first_paragraph_textcontent(resource)
+
+    return text or "A simple self-hosted photo server."

{photo_objects-0.4.0 → photo_objects-0.5.0}/photo_objects/img.py

@@ -30,6 +30,7 @@ class ExifReader:
             value = d.get(key)
             if value is not None:
                 return value
+        return None
 
 
 def _read_original_datetime(image: Image) -> datetime:
@@ -63,7 +64,6 @@ def _read_camera_setup_and_settings(image: Image) -> dict:
         )
     except Exception as e:
         raise e
-        return dict()
 
 
 def _image_format(filename):

{photo_objects-0.4.0 → 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.0
+Version: 0.5.0
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License
@@ -74,7 +74,7 @@ autopep8 -aaar --in-place --exclude back/api/settings.py,*/migrations/*.py back
 Run static analysis with:
 
 ```sh
-pylint -E --enable=invalid-name,unused-import,useless-object-inheritance back/api photo_objects
+pylint back/api photo_objects
 ```
 
 ### Integration tests

{photo_objects-0.4.0 → 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.0 → photo_objects-0.5.0}/pyproject.toml

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

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

@@ -1,28 +0,0 @@
-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
-
-
-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.'
-                    )
-                )

photo_objects-0.4.0/photo_objects/django/views/utils.py

@@ -1,12 +0,0 @@
-from django.utils.safestring import mark_safe
-from markdown import markdown
-
-
-class BackLink:
-    def __init__(self, text, url):
-        self.text = text
-        self.url = url
-
-
-def render_markdown(value):
-    return mark_safe(markdown(value))