photo-objects 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

photo_objects/django/api/backup.py

@@ -1,3 +1,5 @@
+from threading import Thread
+
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.contrib.sites.models import Site
@@ -56,18 +58,11 @@ def _group_dict(group: Group):
     }
 
 
-def create_backup(backup: Backup):
-    # Check if backup already exists
-    if get_backup_object(backup.id):
-        backup.status = "ready"
-        backup.save()
-        return
+def _create_backup(backup_id: int):
+    backup = Backup.objects.get(id=backup_id)
 
     user_model = get_user_model()
 
-    backup.status = "pending"
-    backup.save()
-
     try:
         albums = Album.objects.all()
         for album in albums:
@@ -140,6 +135,21 @@ def create_backup(backup: Backup):
     backup.save()
 
 
+def create_backup(backup: Backup):
+    # Check if backup already exists
+    if get_backup_object(backup.id):
+        backup.status = "ready"
+        backup.save()
+        return
+
+    backup.status = "pending"
+    backup.save()
+
+    # Start creating backup in a separate thread
+    thread = Thread(target=_create_backup, args=(backup.id,))
+    thread.start()
+
+
 def delete_backup(backup: Backup):
     return delete_backup_objects(backup.id)
 

photo_objects/django/api/utils.py

@@ -50,7 +50,7 @@ class JsonProblem(PhotoObjectsError):
         return render(request, "photo_objects/problem.html", {
             "title": "Error",
             "back": BackLink(
-                'Back to albums',
+                'Albums',
                 reverse_lazy('photo_objects:list_albums')),
             "problem_title": self.title,
             "status": self.status

photo_objects/django/objsto.py

@@ -42,9 +42,9 @@ def _objsto_access() -> tuple[dict, Minio]:
     )
 
     return (conf, Minio(
-        conf.get('URL'),
-        conf.get('ACCESS_KEY'),
-        conf.get('SECRET_KEY'),
+        endpoint=conf.get('URL'),
+        access_key=conf.get('ACCESS_KEY'),
+        secret_key=conf.get('SECRET_KEY'),
         http_client=http,
         secure=conf.get('SECURE', True),
     ))
@@ -55,8 +55,8 @@ def _backup_access() -> tuple[Minio, str]:
     bucket = conf.get('BACKUP_BUCKET', 'backups')
 
     # TODO: move this to management command
-    if not client.bucket_exists(bucket):
-        client.make_bucket(bucket)
+    if not client.bucket_exists(bucket_name=bucket):
+        client.make_bucket(bucket_name=bucket)
 
     return client, bucket
 
@@ -66,9 +66,12 @@ def _photos_access() -> tuple[Minio, str]:
     bucket = conf.get('BUCKET', 'photos')
 
     # TODO: move this to management command
-    if not client.bucket_exists(bucket):
-        client.make_bucket(bucket)
-        client.set_bucket_policy(bucket, _anonymous_readonly_policy(bucket))
+    if not client.bucket_exists(bucket_name=bucket):
+        client.make_bucket(bucket_name=bucket)
+        client.set_bucket_policy(
+            bucket_name=bucket,
+            policy=_anonymous_readonly_policy(bucket),
+        )
 
     return client, bucket
 
@@ -79,9 +82,9 @@ def _put_json(key, data, access_fn):
 
     client, bucket = access_fn()
     client.put_object(
-        bucket,
-        key,
-        stream,
+        bucket_name=bucket,
+        object_name=key,
+        data=stream,
         length=-1,
         part_size=10 * MEGABYTE,
         content_type="application/json",
@@ -92,7 +95,7 @@ def _list_all(client: Minio, bucket: str, prefix: str):
     start_after = None
     while True:
         objects = client.list_objects(
-            bucket,
+            bucket_name=bucket,
             prefix=prefix,
             recursive=True,
             start_after=start_after)
@@ -112,12 +115,18 @@ def _list_all(client: Minio, bucket: str, prefix: str):
 
 def _get_all(client: Minio, bucket: str, prefix: str):
     for i in _list_all(client, bucket, prefix):
-        yield client.get_object(bucket, i.object_name)
+        yield client.get_object(
+            bucket_name=bucket,
+            object_name=i.object_name,
+        )
 
 
 def _delete_all(client: Minio, bucket: str, prefix: str):
     for i in _list_all(client, bucket, prefix):
-        client.remove_object(bucket, i.object_name)
+        client.remove_object(
+            bucket_name=bucket,
+            object_name=i.object_name,
+        )
         yield i.object_name
 
 
@@ -141,7 +150,10 @@ def get_backup_object(backup_id: int):
     client, bucket = _backup_access()
 
     try:
-        data = client.get_object(bucket, backup_info_key(backup_id))
+        data = client.get_object(
+            bucket_name=bucket,
+            object_name=backup_info_key(backup_id),
+        )
         return json.loads(data.read())
     except S3Error as e:
         if e.code == "NoSuchKey":
@@ -162,7 +174,10 @@ def get_backup_data(id_: int, type_=None):
 
 def delete_backup_objects(id_: int):
     client, bucket = _backup_access()
-    client.remove_object(bucket, backup_info_key(id_))
+    client.remove_object(
+        bucket_name=bucket,
+        object_name=backup_info_key(id_),
+    )
     for _ in _delete_all(client, bucket, backup_data_prefix(id_)):
         continue
 
@@ -198,9 +213,9 @@ def put_photo(album_key, photo_key, size_key, photo_file, image_format=None):
 
     client, bucket = _photos_access()
     return client.put_object(
-        bucket,
-        photo_path(album_key, photo_key, size_key),
-        photo_file,
+        bucket_name=bucket,
+        object_name=photo_path(album_key, photo_key, size_key),
+        data=photo_file,
         length=-1,
         part_size=10 * MEGABYTE,
         content_type=content_type,
@@ -211,8 +226,8 @@ def put_photo(album_key, photo_key, size_key, photo_file, image_format=None):
 def get_photo(album_key, photo_key, size_key):
     client, bucket = _photos_access()
     return client.get_object(
-        bucket,
-        photo_path(album_key, photo_key, size_key)
+        bucket_name=bucket,
+        object_name=photo_path(album_key, photo_key, size_key)
     )
 
 
@@ -220,7 +235,10 @@ def delete_photo(album_key, photo_key):
     client, bucket = _photos_access()
 
     for i in PhotoSize:
-        client.remove_object(bucket, photo_path(album_key, photo_key, i.value))
+        client.remove_object(
+            bucket_name=bucket,
+            object_name=photo_path(album_key, photo_key, i.value),
+        )
 
 
 def delete_scaled_photos(sizes):
@@ -251,7 +269,10 @@ def put_photo_sizes(sizes: PhotoSizes):
 def get_photo_sizes() -> PhotoSizes:
     client, bucket = _photos_access()
     try:
-        data = client.get_object(bucket, "photo_sizes.json")
+        data = client.get_object(
+            bucket_name=bucket,
+            object_name="photo_sizes.json",
+        )
         return parse_photo_sizes(json.loads(data.read()))
     except S3Error as e:
         if e.code == "NoSuchKey":

photo_objects/django/views/ui/album.py

@@ -40,7 +40,7 @@ def new_album(request: HttpRequest):
     else:
         form = CreateAlbumForm(initial={"key": "_new"}, user=request.user)
 
-    back = BackLink("Back to albums", reverse('photo_objects:list_albums'))
+    back = BackLink("Albums", reverse('photo_objects:list_albums'))
 
     return render(request, 'photo_objects/form.html', {
         "form": form,
@@ -59,7 +59,7 @@ def show_album(request: HttpRequest, album_key: str):
     album = api.check_album_access(request, album_key)
     photos = album.photo_set.all()
 
-    back = BackLink("Back to albums", reverse('photo_objects:list_albums'))
+    back = BackLink("Albums", reverse('photo_objects:list_albums'))
     details = {
         "Description": render_markdown(album.description),
         "Visibility": Album.Visibility(album.visibility).label,
@@ -102,7 +102,7 @@ def edit_album(request: HttpRequest, album_key: str):
 
     target = album.title or album.key
     back = BackLink(
-        f'Back to {target}',
+        target,
         reverse(
             'photo_objects:show_album',
             kwargs={"album_key": album_key}))
@@ -125,7 +125,7 @@ def delete_album(request: HttpRequest, album_key: str):
         album = api.check_album_access(request, album_key)
         target = album.title or album.key
         back = BackLink(
-            f'Back to {target}',
+            target,
             reverse(
                 'photo_objects:show_album',
                 kwargs={

photo_objects/django/views/ui/configuration.py

@@ -167,7 +167,7 @@ def configuration(request: HttpRequest):
         site_description_configured(request),
     ]
 
-    back = BackLink("Back to albums", reverse('photo_objects:list_albums'))
+    back = BackLink("Albums", reverse('photo_objects:list_albums'))
 
     return render(request, "photo_objects/configuration.html", {
         "title": "Configuration",

photo_objects/django/views/ui/photo.py

@@ -43,7 +43,7 @@ def upload_photos(request: HttpRequest, album_key: str):
     album = api.check_album_access(request, album_key)
     target = album.title or album.key
     back = BackLink(
-        f"Back to {target}", reverse(
+        target, reverse(
             'photo_objects:show_album', kwargs={
                 "album_key": album_key}))
 
@@ -109,7 +109,7 @@ def show_photo(request: HttpRequest, album_key: str, photo_key: str):
 
     previous_filename = photo.key.split("/")[-1]
     next_filename = previous_filename
-    back = BackLink("Back to albums", reverse('photo_objects:list_albums'))
+    back = BackLink("Albums", reverse('photo_objects:list_albums'))
 
     try:
         api.check_album_access(request, photo.album.key)
@@ -125,7 +125,7 @@ def show_photo(request: HttpRequest, album_key: str, photo_key: str):
 
         target = photo.album.title or photo.album.key
         back = BackLink(
-            f"Back to {target}", reverse(
+            target, reverse(
                 'photo_objects:show_album', kwargs={
                     "album_key": album_key}))
     except AlbumNotFound:
@@ -170,7 +170,7 @@ def edit_photo(request: HttpRequest, album_key: str, photo_key: str):
 
     target = photo.title or photo.filename
     back = BackLink(
-        f'Back to {target}',
+        target,
         reverse(
             'photo_objects:show_photo',
             kwargs={
@@ -197,7 +197,7 @@ def delete_photo(request: HttpRequest, album_key: str, photo_key: str):
         photo = api.check_photo_access(request, album_key, photo_key, "xs")
         target = photo.title or photo.filename
         back = BackLink(
-            f'Back to {target}',
+            target,
             reverse(
                 'photo_objects:show_photo',
                 kwargs={

photo_objects/django/views/ui/photo_change_request.py

@@ -47,7 +47,7 @@ def review_photo_change_request(request: HttpRequest, cr_id: str):
     else:
         info = f"There are {count} change requests in the review queue."
 
-    back = BackLink("Back to albums", reverse('photo_objects:list_albums'))
+    back = BackLink("Albums", reverse('photo_objects:list_albums'))
 
     return render(request, 'photo_objects/form.html', {
         "form": form,

photo_objects/django/views/ui/users.py

@@ -16,7 +16,7 @@ def login(request: HttpRequest):
             "photo": settings.preview_image,
             "action": "Login",
             "back": BackLink(
-                'Back to albums',
+                'Albums',
                 reverse_lazy('photo_objects:list_albums')),
             "class": "login"
         },

photo_objects/django/views/utils.py

@@ -6,7 +6,7 @@ from photo_objects.utils import first_paragraph_textcontent
 
 
 class BackLink:
-    def __init__(self, text, url):
+    def __init__(self, text: str, url: str):
         self.text = text
         self.url = url
 

{photo_objects-0.9.3.dist-info → photo_objects-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.9.3
+Version: 0.9.5
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License
@@ -42,7 +42,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: markdown~=3.7
-Requires-Dist: minio~=7.2
+Requires-Dist: minio<7.2.19,>=7.2.0
 Requires-Dist: pillow~=10.4
 Dynamic: license-file
 

{photo_objects-0.9.3.dist-info → photo_objects-0.9.5.dist-info}/RECORD

@@ -10,16 +10,16 @@ photo_objects/django/conf.py,sha256=ZpeIulEc1tpr8AO52meNKOF30Xf5osbDtDyHvQRtkx4,
 photo_objects/django/context_processors.py,sha256=XacUmcYV-4NMMMNXPWrHKdvNd6lfyamisngaVerREiU,306
 photo_objects/django/forms.py,sha256=zSSmdIYn4PEx1Nnw-tuo4h4otKj3C099lB4-vp2BRUc,6861
 photo_objects/django/models.py,sha256=OxkkczIBg7TaFWWm4VdtbRMJOK_OQKrV29g-X2cm5BQ,7247
-photo_objects/django/objsto.py,sha256=jDk5o1b0TZdRA5ie8rbEB4B7y9yG2FzYJGqUPER5JNk,6340
+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=XnOSEB8YtAJamlEsjKYz6U1DfDu7HHZpAinpqdulR8k,2501
 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=_D1KMkIp7A8iPs2LxQ-MsaFcAHwCwhE7un5NRHHIvOc,6099
+photo_objects/django/api/backup.py,sha256=lu-lDSGpEV9ASCIA5o0kNOZcg6_cmkVPCy1TFRvYyyY,6344
 photo_objects/django/api/photo.py,sha256=-lo1g6jfBr884wy-WV2DAEPxzH9V-tFUTRtitmA6i28,4471
 photo_objects/django/api/photo_change_request.py,sha256=v94RA7SUM60tC9mIZdz8HppbNKfHWeTFNPr_BPw3pys,3075
-photo_objects/django/api/utils.py,sha256=8r51YgFgKPD05Zjzhstl4jlQ4JM8DtsxUyAzhjXi5Pk,5567
+photo_objects/django/api/utils.py,sha256=M7GdTZAkeAWSRjZeI51dlv8qaw2CjX3ruKsa1amc1Es,5559
 photo_objects/django/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/management/commands/clean-scaled-photos.py,sha256=KJY6phgTCxcmbMUsUfCRQjatvCmKyFninM8zT-tB3Kc,2008
@@ -46,21 +46,21 @@ photo_objects/django/tests/test_photo_change_requests.py,sha256=Ld5ytqxxZiEWrqfX
 photo_objects/django/tests/test_utils.py,sha256=0Xl0ReS2X9GsEH-jmLg8xC79hJ4nhbfULo0BOVjiykQ,2089
 photo_objects/django/tests/utils.py,sha256=LiObyRARkmO4arnY2gXNi_T8XxT9eSKKszENMo2UIh8,4639
 photo_objects/django/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-photo_objects/django/views/utils.py,sha256=AjJK5r5HmTF63E9Q4W3pKggDESuhNXUvbROpS8m70KM,1319
+photo_objects/django/views/utils.py,sha256=TSs3RTtSi_4GcgeM8I3i36-sga95JV0VD0nYK4EZkWk,1329
 photo_objects/django/views/api/__init__.py,sha256=GgywMJMSFmP5aoMEaYut5V666zachd5YFQIDBMr5znU,188
 photo_objects/django/views/api/album.py,sha256=EZMOkxYzLSWr9wwXnd4yAO64JtXZq2k3FYohiNMFbGQ,1602
 photo_objects/django/views/api/auth.py,sha256=EN_ExegzmLN-bhSzu3L9-6UE9qodPd7_ZRLilzrvc8Y,819
 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=WmWrbY3nPCK7NIZYE9rJPzC39HjwN-TW8fN4gxIC3Yk,4765
-photo_objects/django/views/ui/configuration.py,sha256=jyZT3ZAzKa7RnzhED5anDShRCBiCHxOU81Cddt10-4Q,5096
-photo_objects/django/views/ui/photo.py,sha256=flwcET5nSChzfyAEWRTUlklTW2o64przNXSdWn-jxLw,6676
-photo_objects/django/views/ui/photo_change_request.py,sha256=eaYGXFqtHj8qonDAmPyn4nrEHkL13EBD-1s8Phs0XP4,2098
-photo_objects/django/views/ui/users.py,sha256=nb73cnzuV98QkJb0j8F2hqPgOGFIWpUFTFu6dXMeVwM,722
+photo_objects/django/views/ui/album.py,sha256=b07jboWsiRJUHC1BPLC8vmNbpePjtFzKzbc9QbBoPYM,4723
+photo_objects/django/views/ui/configuration.py,sha256=PIKqjTJ8szVlLodo9rU6XA2hh9FXrSSpnKWgUFY8E8g,5088
+photo_objects/django/views/ui/photo.py,sha256=erk1-b6A3pr1XMMcEmB1PcjFysvbfiLhfXx1yrKTCdI,6616
+photo_objects/django/views/ui/photo_change_request.py,sha256=CFBV-O9k7WzdeYXYB7N7_g5xHw_seh9-Dzis8M6zbOo,2090
+photo_objects/django/views/ui/users.py,sha256=XOVqOgLwxD2QKua_bPl7wZUNrBd_bABbCaHYLSnhMI0,714
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.9.3.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.9.3.dist-info/METADATA,sha256=gWQW91vUQX-zsuk3XK16hBx2q1h2llDSizZtJnUnXN4,3605
-photo_objects-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.9.3.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.9.3.dist-info/RECORD,,
+photo_objects-0.9.5.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.9.5.dist-info/METADATA,sha256=8gbXtVaHTTijCVmKHr-9ru8AdYYdGeyOe2Ol_Pdo5xc,3615
+photo_objects-0.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.9.5.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.9.5.dist-info/RECORD,,