photo-objects 0.10.3__py3-none-any.whl → 0.10.5__py3-none-any.whl

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/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/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/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.dist-info → photo_objects-0.10.5.dist-info}/METADATA

@@ -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.dist-info → photo_objects-0.10.5.dist-info}/RECORD

@@ -9,14 +9,14 @@ photo_objects/django/apps.py,sha256=Apqu6o6fpoxda18NQgKupvQRvTAZxVviIK_-dUR3rck,
 photo_objects/django/conf.py,sha256=ZpeIulEc1tpr8AO52meNKOF30Xf5osbDtDyHvQRtkx4,2593
 photo_objects/django/context_processors.py,sha256=XacUmcYV-4NMMMNXPWrHKdvNd6lfyamisngaVerREiU,306
 photo_objects/django/forms.py,sha256=DWCnVEznev3h5ztYXz0gjMGZ8QUwlqML4KUKHcUiiZ4,7848
-photo_objects/django/models.py,sha256=DsbaFo3xhzy5MHgtZXYmZuaHYqJSPPCTaZWAy_lHndU,7746
+photo_objects/django/models.py,sha256=0UeCaeDj3bfRPnVCtmbH1jNmhhg15eJSQEi_WuG9FEA,7778
 photo_objects/django/objsto.py,sha256=kf-Tv-kDt47Mnx0xMolAct_lP4M0H9xg03M3BnfAnJM,6909
 photo_objects/django/signals.py,sha256=_gb4vlZkeFNYWXxwhNreaUJoOsbIWvP8OovVLtzepaE,2161
 photo_objects/django/urls.py,sha256=QHGjDj3XCArLtmMcP3DKp8H9Xfd2X4SEvEKmMnx2KDk,2551
 photo_objects/django/api/__init__.py,sha256=51CRTiE975ufVhvI5x-M_2D28JP8FZWyLFiuV5EaQSg,120
 photo_objects/django/api/album.py,sha256=CJDeGLCuYoxGUDcjssZRpFnToxG_KVE9Ii7NduFW2ks,2003
 photo_objects/django/api/auth.py,sha256=lS0S1tMVH2uN30g4jlixklv3eMnQ2FbQVQvuRXeMGYo,1420
-photo_objects/django/api/backup.py,sha256=lu-lDSGpEV9ASCIA5o0kNOZcg6_cmkVPCy1TFRvYyyY,6344
+photo_objects/django/api/backup.py,sha256=I6C-VQSN86CZ1FbWfk0jvvLLGeXZNP3zQyjJqSnLmwI,6666
 photo_objects/django/api/photo.py,sha256=GtrLMQAQRDQa79cAiEnYVeZ9Wr9CIpHC9ApDqAh5uiQ,2999
 photo_objects/django/api/photo_change_request.py,sha256=v94RA7SUM60tC9mIZdz8HppbNKfHWeTFNPr_BPw3pys,3075
 photo_objects/django/api/utils.py,sha256=73yT8s5N7MtgHbIs7us7GQX3t5vOue_2-wHiUGyD81s,5394
@@ -54,14 +54,14 @@ photo_objects/django/views/api/auth.py,sha256=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZR
 photo_objects/django/views/api/photo.py,sha256=WHSayWTi_wG6otq6Rz1IKqJ5ik5riclR3AWB15ge5RU,4613
 photo_objects/django/views/api/utils.py,sha256=uQzKdSKHRAux5OZzqgWQr0gsK_FeweQP0cg_67OWA_Y,264
 photo_objects/django/views/ui/__init__.py,sha256=Y3XrckZExbHpWVNwDUGLfb99_midb8-5j6Ouf_Yu_G4,128
-photo_objects/django/views/ui/album.py,sha256=0n_c-5MYJouzg2plK6_ZBtE6iqOdaqttY1RdsFO2V9s,5495
+photo_objects/django/views/ui/album.py,sha256=BOZbacGQtmUKC5BwzFlfb4pOAZ77DkP4CUYXZuU8Wq8,5575
 photo_objects/django/views/ui/configuration.py,sha256=miEJTm_cRANu9Wt3SCcU-tYUwM7WLKgQm8zgApmKMxE,5464
-photo_objects/django/views/ui/photo.py,sha256=EOu43klthhmG6ysCrw2NWb7Vcz8I3FBR6GZUFhLBLG4,6281
+photo_objects/django/views/ui/photo.py,sha256=VCJYV_xJbKNC9Vk1dJuEH0Nka96ufyxNL64apvgXY9c,6662
 photo_objects/django/views/ui/photo_change_request.py,sha256=PGP98APOVTkTw3FTvzYn92BBshensFwA8U0w8l1vIjg,2127
 photo_objects/django/views/ui/users.py,sha256=ABAtKwNoViYy2ht6X313BSm6wgvL302LVUNimp43gxc,649
 photo_objects/django/views/ui/utils.py,sha256=fAEgG6cdL_u9TBLWgqQGG8zC0RX1a-9vC6C06ST7InM,823
-photo_objects-0.10.3.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.10.3.dist-info/METADATA,sha256=9I5HA3kH3eW3Sg5bY3GC1Yd24wv_0haEP2Jta8IEyOw,3616
-photo_objects-0.10.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.10.3.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.10.3.dist-info/RECORD,,
+photo_objects-0.10.5.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.10.5.dist-info/METADATA,sha256=dDktYzqKzwViZrX94r_XNn9GmmLsVrUvkPvMYt1B3q4,4308
+photo_objects-0.10.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+photo_objects-0.10.5.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.10.5.dist-info/RECORD,,

{photo_objects-0.10.3.dist-info → photo_objects-0.10.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any