photo-objects 0.10.3__tar.gz → 0.10.5__tar.gz

{photo_objects-0.10.3 → photo_objects-0.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.10.3
+Version: 0.10.5
 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,18 +43,40 @@ 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
 
 [![CI](https://github.com/kangasta/photo-objects/actions/workflows/ci.yml/badge.svg)](https://github.com/kangasta/photo-objects/actions/workflows/ci.yml)
+[![Release](https://github.com/kangasta/photo-objects/actions/workflows/release.yml/badge.svg)](https://github.com/kangasta/photo-objects/actions/workflows/release.yml)
 
-Application for storing photos in S3 compatible object-storage.
+Application for storing photos in S3 compatible object-storage. Key features:
+
+- Automatically scales photos according to different sizes defined in settings.
+- Provides simple grouping and access control for the photos with albums.
 
 ## Developing
 
-Make migrations:
+Build containers:
+
+```sh
+docker compose build
+```
+
+Start or update development environment:
+
+```sh
+docker compose up -d
+```
+
+Print initial admin password (username of the initial administrator account is `admin`):
+
+```sh
+docker compose exec api cat /var/photo_objects/initial_admin_password
+```
+
+Make database migrations (requires development environment to be running):
 
 ```sh
 python3 back/manage.py makemigrations --pythonpath="$(pwd)"

{photo_objects-0.10.3 → photo_objects-0.10.5}/README.md

@@ -1,12 +1,34 @@
 # Photo Objects
 
 [![CI](https://github.com/kangasta/photo-objects/actions/workflows/ci.yml/badge.svg)](https://github.com/kangasta/photo-objects/actions/workflows/ci.yml)
+[![Release](https://github.com/kangasta/photo-objects/actions/workflows/release.yml/badge.svg)](https://github.com/kangasta/photo-objects/actions/workflows/release.yml)
 
-Application for storing photos in S3 compatible object-storage.
+Application for storing photos in S3 compatible object-storage. Key features:
+
+- Automatically scales photos according to different sizes defined in settings.
+- Provides simple grouping and access control for the photos with albums.
 
 ## Developing
 
-Make migrations:
+Build containers:
+
+```sh
+docker compose build
+```
+
+Start or update development environment:
+
+```sh
+docker compose up -d
+```
+
+Print initial admin password (username of the initial administrator account is `admin`):
+
+```sh
+docker compose exec api cat /var/photo_objects/initial_admin_password
+```
+
+Make database migrations (requires development environment to be running):
 
 ```sh
 python3 back/manage.py makemigrations --pythonpath="$(pwd)"

{photo_objects-0.10.3 → photo_objects-0.10.5}/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.3 → photo_objects-0.10.5}/photo_objects/django/models.py

@@ -256,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.3 → photo_objects-0.10.5}/photo_objects/django/views/ui/album.py

@@ -78,6 +78,8 @@ def show_album(request: HttpRequest, album_key: str):
         "Description": render_markdown(album.description),
         "Timeline": _timeline(album),
         "Visibility": Album.Visibility(album.visibility).label,
+        "Created at": album.created_at,
+        "Updated at": album.updated_at,
     }
 
     return render(request, "photo_objects/album/show.html", {

{photo_objects-0.10.3 → photo_objects-0.10.5}/photo_objects/django/views/ui/photo.py

@@ -1,6 +1,7 @@
 from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse
+from django.utils.safestring import mark_safe
 
 from photo_objects.django import api
 from photo_objects.django.api.utils import (
@@ -64,25 +65,34 @@ def _lens(photo: Photo):
     return None
 
 
+def _sec(text: str):
+    return f'<span class="secondary">{text}</span>'
+
+
 def _exposure_time_to_string(exposure_time: float | None):
     if exposure_time is None:
         return None
     if exposure_time < 1:
-        return f"1/{int(1 / exposure_time)}\u202Fs"
+        return mark_safe(
+            f"{_sec('1/')}{int(1 / exposure_time)}\u202F{_sec('s')}")
     else:
-        return f"{int(exposure_time)}\u202Fs"
+        return mark_safe(
+            f"{int(exposure_time)}\u202F{_sec('s')}")
 
 
 def _camera_settings(photo: Photo):
     r = []
     if photo.focal_length:
-        r.append(f"{round(photo.focal_length)}\u202Fmm")
+        r.append(mark_safe(
+            f"{round(photo.focal_length)}\u202F{_sec('mm')}"))
     if photo.f_number:
-        r.append(f"f/{photo.f_number}")
+        r.append(
+            mark_safe(f"{_sec('f/')}{photo.f_number}"))
     if photo.exposure_time:
         r.append(_exposure_time_to_string(photo.exposure_time))
     if photo.iso_speed:
-        r.append(f"ISO\u202F{photo.iso_speed}")
+        r.append(mark_safe(
+            f"{_sec('ISO')}\u202F{photo.iso_speed}"))
     return r
 
 
@@ -120,6 +130,8 @@ def show_photo(request: HttpRequest, album_key: str, photo_key: str):
         "Camera": _camera(photo),
         "Lens": _lens(photo),
         "Settings": _camera_settings(photo),
+        "Created at": photo.created_at,
+        "Updated at": photo.updated_at,
     }
 
     return render(request, "photo_objects/photo/show.html", {

{photo_objects-0.10.3 → photo_objects-0.10.5}/photo_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.10.3
+Version: 0.10.5
 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,18 +43,40 @@ 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
 
 [![CI](https://github.com/kangasta/photo-objects/actions/workflows/ci.yml/badge.svg)](https://github.com/kangasta/photo-objects/actions/workflows/ci.yml)
+[![Release](https://github.com/kangasta/photo-objects/actions/workflows/release.yml/badge.svg)](https://github.com/kangasta/photo-objects/actions/workflows/release.yml)
 
-Application for storing photos in S3 compatible object-storage.
+Application for storing photos in S3 compatible object-storage. Key features:
+
+- Automatically scales photos according to different sizes defined in settings.
+- Provides simple grouping and access control for the photos with albums.
 
 ## Developing
 
-Make migrations:
+Build containers:
+
+```sh
+docker compose build
+```
+
+Start or update development environment:
+
+```sh
+docker compose up -d
+```
+
+Print initial admin password (username of the initial administrator account is `admin`):
+
+```sh
+docker compose exec api cat /var/photo_objects/initial_admin_password
+```
+
+Make database migrations (requires development environment to be running):
 
 ```sh
 python3 back/manage.py makemigrations --pythonpath="$(pwd)"

{photo_objects-0.10.3 → photo_objects-0.10.5}/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.3 → photo_objects-0.10.5}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.10.3"
+version = "0.10.5"
 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",