photo-objects 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

photo_objects/django/api/backup.py

@@ -1,13 +1,15 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
+from django.contrib.sites.models import Site
 from django.db import transaction
 
-from photo_objects.django.models import Album, Backup, Photo
+from photo_objects.django.models import Album, Backup, Photo, SiteSettings
 from photo_objects.django.objsto import (
     backup_data_key,
     backup_info_key,
     delete_backup_objects,
     get_backup_data,
+    get_backup_object,
     get_backup_objects,
     put_backup_json,
 )
@@ -55,6 +57,12 @@ 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
+
     user_model = get_user_model()
 
     backup.status = "pending"
@@ -99,10 +107,34 @@ def create_backup(backup: Backup):
                     user.username),
                 _user_dict(user))
 
+        sites = Site.objects.all()
+        for site in sites:
+            put_backup_json(
+                backup_data_key(backup.id, 'site', site.id),
+                {
+                    "id": site.id,
+                    "domain": site.domain,
+                    "name": site.name,
+                }
+            )
+
+        site_settings = SiteSettings.objects.all()
+        for settings in site_settings:
+            put_backup_json(
+                backup_data_key(backup.id, 'settings', settings.site.id),
+                {
+                    "site_id": settings.site.id,
+                    "description": settings.description,
+                    "preview_image_key": settings.preview_image.key
+                    if settings.preview_image else None,
+                }
+            )
+
         put_backup_json(backup_info_key(backup.id), backup.to_json())
     except Exception:
         backup.status = "create_failed"
         backup.save()
+        raise
 
     backup.status = "ready"
     backup.save()
@@ -160,3 +192,24 @@ def restore_backup(backup_id: int):
             if cover_photo == filename:
                 album.cover_photo = photo
                 album.save()
+
+    for i in get_backup_data(backup_id, "site"):
+        site, _ = Site.objects.get_or_create(id=i.get("id"))
+        site.domain = i.get("domain")
+        site.name = i.get("name")
+        site.save()
+
+    for i in get_backup_data(backup_id, "settings"):
+        site = Site.objects.get(id=i.get("site_id"))
+
+        preview_image = None
+        if key := i.get("preview_image_key"):
+            preview_image = Photo.objects.get(key=key)
+
+        settings = SiteSettings.objects.create(
+            site=site,
+            description=i.get("description"),
+            preview_image=preview_image
+            if i.get("preview_image_key") else None
+        )
+        settings.save()

photo_objects/django/management/commands/restore-backup.py

@@ -1,7 +1,11 @@
 # pylint: disable=invalid-name
+from io import StringIO
+
+from django.core.management import call_command
 from django.core.management.base import BaseCommand
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
+from django.db import connection
 
 from photo_objects.django.api.backup import get_backups, restore_backup
 from photo_objects.django.models import Album, Photo
@@ -28,6 +32,23 @@ class DatabaseStatus:
         )
 
 
+def reset_sequences():
+    output = StringIO()
+    call_command(
+        'sqlsequencereset',
+        'photo_objects',
+        'auth',
+        'sites',
+        stdout=output,
+        no_color=True)
+
+    sql = output.getvalue()
+    with connection.cursor() as cursor:
+        cursor.execute(sql)
+
+    output.close()
+
+
 class Command(BaseCommand):
     help = "Restore latest backup if database is empty."
 
@@ -59,6 +80,7 @@ class Command(BaseCommand):
                 )
             )
             restore_backup(id_)
+            reset_sequences()
             status = DatabaseStatus()
             self.stdout.write(
                 self.style.SUCCESS(
@@ -71,4 +93,4 @@ class Command(BaseCommand):
                     f'Failed to restore backup: {e}'
                 )
             )
-            exit(1)
+            raise

photo_objects/django/objsto.py

@@ -137,6 +137,14 @@ def put_backup_json(key: str, data: dict):
     return _put_json(key, data, _backup_access)
 
 
+def get_backup_object(backup_id: int):
+    client, bucket = _backup_access()
+    return json.loads(
+        client.get_object(
+            bucket,
+            backup_info_key(backup_id)).read())
+
+
 def get_backup_objects():
     client, bucket = _backup_access()
     return [json.loads(i.read()) for i in _get_all(client, bucket, 'info_')]

photo_objects/django/tests/test_utils.py

@@ -25,6 +25,9 @@ class TestUtils(TestCase):
     def test_slugify_lower(self):
         self.assertEqual(slugify("QwErTy!", True), "qwerty-")
 
+    def test_slugify_number(self):
+        self.assertEqual(slugify(123), "123")
+
     def test_slugify_replace_leading_underscores(self):
         self.assertEqual(
             slugify(

photo_objects/utils.py

@@ -31,9 +31,12 @@ def timestamp_str(timestamp: datetime):
     return timestamp.isoformat() if timestamp else None
 
 
-def slugify(title: str, lower=False, replace_leading_underscores=False) -> str:
+def slugify(
+        title: str | int,
+        lower=False,
+        replace_leading_underscores=False) -> str:
     key = unicodedata.normalize(
-        'NFKD', title).encode(
+        'NFKD', str(title)).encode(
         'ascii', 'ignore').decode('ascii')
     if lower:
         key = key.lower()

{photo_objects-0.9.0.dist-info → photo_objects-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.9.0
+Version: 0.9.1
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.9.0.dist-info → photo_objects-0.9.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ photo_objects/__init__.py,sha256=I1508w_ntomEqTFQgC74SurhxVXfCiDWZLRsny2f59g,60
 photo_objects/config.py,sha256=0-Aeo-z-d_fxx-cjAjxSwPJZUgYaAi7NTodiErlxIXo,861
 photo_objects/error.py,sha256=7afLYjxM0EaYioxVw_XUqHTvfSMSuQPUwwle0OVlaDY,45
 photo_objects/img.py,sha256=2HVGS2g7rS2hnomozYL92oxrcN6zjDTHvWNr-UAqtGQ,4620
-photo_objects/utils.py,sha256=V0THzeLSGkgLTWdVhP-ee1nb-vl051mtF4AQqdgMo88,1145
+photo_objects/utils.py,sha256=M4SeHC_R4B-2LUHx_dQrY9vuzTTKjY31uwU0Vy1Hj7Q,1181
 photo_objects/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/admin.py,sha256=pvyQKs2FMtKtSS2PE_NKR_jsSi7-GKz3bbsqDNgjt6w,352
 photo_objects/django/apps.py,sha256=Apqu6o6fpoxda18NQgKupvQRvTAZxVviIK_-dUR3rck,1444
@@ -10,13 +10,13 @@ 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=lYOd1PJzrcmqtqw-Xci85MX_9yWqzeisYx4uJjXhHdQ,6046
+photo_objects/django/objsto.py,sha256=NSimuKvS06dERaEPevM6v9PDxFsgz6JUhlcKmUxnnP0,6243
 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=Lq9fTjuoZssQG86QJFIxlLpQi2FU0AS8yCZklvu_ues,4379
+photo_objects/django/api/backup.py,sha256=_D1KMkIp7A8iPs2LxQ-MsaFcAHwCwhE7un5NRHHIvOc,6099
 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
@@ -24,7 +24,7 @@ photo_objects/django/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 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
 photo_objects/django/management/commands/create-initial-admin-account.py,sha256=PhC7jnRxsph8rML384vKfXzYfJqMQdd8oUHxUY7JEW8,1178
-photo_objects/django/management/commands/restore-backup.py,sha256=pnlHWcEgFDlgKaslC5PdhVcm491uRylCD3ZdRwGS0B0,2157
+photo_objects/django/management/commands/restore-backup.py,sha256=7Hc-6O_4hv8m66CoWbedjH20KVzURFstLPGPq6ooBuk,2607
 photo_objects/django/migrations/0001_initial.py,sha256=BLW-EZ38sBgDhOYyprc-h_vuPpRxA11qxt4ZuYNO1Wo,2424
 photo_objects/django/migrations/0002_created_at_updated_at.py,sha256=7OT2VvDffAkX9XKBHVY-jvzxeIl2yU0Jr1ByCNGcUfw,1039
 photo_objects/django/migrations/0003_admin_visibility.py,sha256=PdxPOJzr-ViRBlOYUHEEGhe0hLtDysZJdMqvbjKVpEg,529
@@ -43,7 +43,7 @@ photo_objects/django/tests/test_img.py,sha256=HEAWcr5fpTkzePkhoQ4YrWsDO9TvFOr7my
 photo_objects/django/tests/test_og_meta.py,sha256=Kk5a9KvE88KZ60gLqXSe6rTz5YU-gdjteksYolHd-nw,1804
 photo_objects/django/tests/test_photo.py,sha256=JWXN3fF2VtuByMKm2o5b19HnxwDr6ecRwuGzgc5RsBw,13471
 photo_objects/django/tests/test_photo_change_requests.py,sha256=Ld5ytqxxZiEWrqfX8htJ6-5ARU7tqTYD-iUhb7EMcnU,3078
-photo_objects/django/tests/test_utils.py,sha256=zBLv8lkvcLMCaH4D6GR1KZqUe-rPowhcBkQX19-Kshs,2007
+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
@@ -59,8 +59,8 @@ photo_objects/django/views/ui/photo.py,sha256=flwcET5nSChzfyAEWRTUlklTW2o64przNX
 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/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.9.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.9.0.dist-info/METADATA,sha256=54uuCEzSyejSGgQ2AlWFlCjuwawJFHfLBxRE_EQ47D4,3605
-photo_objects-0.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.9.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.9.0.dist-info/RECORD,,
+photo_objects-0.9.1.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.9.1.dist-info/METADATA,sha256=GoExSl5yt_qDGeEaIzeeue4bGNcIC-mcx2RgDe1i1EY,3605
+photo_objects-0.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.9.1.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.9.1.dist-info/RECORD,,