photo-objects 0.10.2__tar.gz → 0.10.4__tar.gz

{photo_objects-0.10.2 → photo_objects-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.10.2
+Version: 0.10.4
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License
@@ -29,7 +29,7 @@ Project-URL: Homepage, https://github.com/kangasta/photo-objects
 Project-URL: Repository, https://github.com/kangasta/photo-objects.git
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 6.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: markdown~=3.7
 Requires-Dist: minio<7.2.19,>=7.2.0
-Requires-Dist: pillow~=10.4
+Requires-Dist: pillow~=12.0
 Dynamic: license-file
 
 # Photo Objects

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects/django/api/backup.py

@@ -1,4 +1,5 @@
 from threading import Thread
+from time import sleep
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
@@ -59,7 +60,20 @@ def _group_dict(group: Group):
 
 
 def _create_backup(backup_id: int):
-    backup = Backup.objects.get(id=backup_id)
+    # Backup might not be available immediately.
+    # Retry getting the backup a few times.
+    for _ in range(5):
+        try:
+            backup = Backup.objects.get(id=backup_id)
+            break
+        except Backup.DoesNotExist:
+            sleep(2)
+
+    if not backup:
+        return
+
+    backup.status = "processing"
+    backup.save()
 
     user_model = get_user_model()
 

photo_objects-0.10.4/photo_objects/django/migrations/0008_sitesettings_copyright_notice.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.2.6 on 2025-12-20 18:09
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photo_objects', '0007_backup'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='copyright_notice',
+            field=models.CharField(blank=True, help_text='Copyright notice to display in the site footer. Content will be HTML-escaped before rendering.'),
+        ),
+        migrations.AlterField(
+            model_name='sitesettings',
+            name='description',
+            field=models.TextField(blank=True, help_text='Description of the site, used in site level meta description tags and social media previews.'),
+        ),
+        migrations.AlterField(
+            model_name='sitesettings',
+            name='preview_image',
+            field=models.ForeignKey(blank=True, help_text='Photo to use as the site level social media preview image.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='photo_objects.photo'),
+        ),
+    ]

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects/django/models.py

@@ -211,10 +211,26 @@ class SiteSettings(models.Model):
     site = models.OneToOneField(
         Site, on_delete=models.CASCADE, related_name="settings")
 
-    description = models.TextField(blank=True)
+    description = models.TextField(
+        blank=True,
+        help_text=_(
+            "Description of the site, used in site level meta description "
+            "tags and social media previews."),
+    )
     preview_image = models.ForeignKey(
-        Photo, blank=True, null=True, on_delete=models.SET_NULL)
-
+        Photo,
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+        help_text=_(
+            "Photo to use as the site level social media preview image."),
+    )
+    copyright_notice = models.CharField(
+        blank=True,
+        help_text=_(
+            "Copyright notice to display in the site footer. Content will be "
+            "HTML-escaped before rendering."),
+    )
     objects = SiteSettingsManager()
 
     def __str__(self):
@@ -240,6 +256,7 @@ class Backup(models.Model):
         return _str(
             f'Backup {self.id}',
             created_at=self.created_at,
+            status=self.status,
             comment=self.comment,
         )
 

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects/django/templatetags/photo_objects_extras.py

@@ -1,5 +1,7 @@
 from datetime import datetime
 from django import template
+from django.utils.safestring import mark_safe
+from django.utils.html import escape
 
 from photo_objects.django.models import SiteSettings
 from photo_objects.django.views.utils import meta_description
@@ -59,3 +61,19 @@ def meta_og(context):
         }
     except Exception:
         return context
+
+
+@register.simple_tag(takes_context=True)
+def copyright_notice(context):
+    try:
+        request = context.get("request")
+        site = request.site
+
+        settings = SiteSettings.objects.get(site)
+
+        if settings.copyright_notice:
+            notice = escape(settings.copyright_notice)
+            return mark_safe(f"<div>{notice}</div>")
+        return ""
+    except Exception:
+        return ""

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects/django/views/ui/album.py

@@ -56,6 +56,18 @@ def get_info(request: HttpRequest, album_key: str):
     return None
 
 
+def _timeline(album: Album):
+    if not album.first_timestamp or not album.last_timestamp:
+        return None
+
+    start = album.first_timestamp.strftime("%Y %B")
+    end = album.last_timestamp.strftime("%Y %B")
+
+    if start == end:
+        return start
+    return f"{start} – {end}"
+
+
 @json_problem_as_html
 def show_album(request: HttpRequest, album_key: str):
     album = api.check_album_access(request, album_key)
@@ -64,6 +76,7 @@ def show_album(request: HttpRequest, album_key: str):
     back = BackLink("Albums", reverse('photo_objects:list_albums'))
     details = {
         "Description": render_markdown(album.description),
+        "Timeline": _timeline(album),
         "Visibility": Album.Visibility(album.visibility).label,
     }
 

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.10.2
+Version: 0.10.4
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License
@@ -29,7 +29,7 @@ Project-URL: Homepage, https://github.com/kangasta/photo-objects
 Project-URL: Repository, https://github.com/kangasta/photo-objects.git
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 6.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: markdown~=3.7
 Requires-Dist: minio<7.2.19,>=7.2.0
-Requires-Dist: pillow~=10.4
+Requires-Dist: pillow~=12.0
 Dynamic: license-file
 
 # Photo Objects

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ photo_objects/django/migrations/0004_camera_setup_and_settings.py
 photo_objects/django/migrations/0005_sitesettings.py
 photo_objects/django/migrations/0006_photo_alt_text.py
 photo_objects/django/migrations/0007_backup.py
+photo_objects/django/migrations/0008_sitesettings_copyright_notice.py
 photo_objects/django/migrations/__init__.py
 photo_objects/django/templatetags/__init__.py
 photo_objects/django/templatetags/photo_objects_extras.py

{photo_objects-0.10.2 → photo_objects-0.10.4}/photo_objects.egg-info/requires.txt

@@ -1,3 +1,3 @@
 markdown~=3.7
 minio<7.2.19,>=7.2.0
-pillow~=10.4
+pillow~=12.0

{photo_objects-0.10.2 → photo_objects-0.10.4}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.10.2"
+version = "0.10.4"
 dependencies = [
     "markdown~=3.7",
     "minio>=7.2.0,<7.2.19",
-    "pillow~=10.4"
+    "pillow~=12.0"
 ]
 description = "Application for storing photos in S3 compatible object-storage."
 readme = "README.md"
@@ -20,7 +20,7 @@ authors = [
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 5.0",
+    "Framework :: Django :: 6.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",