photo-objects 0.9.0__tar.gz → 0.9.1__tar.gz

{photo_objects-0.9.0 → photo_objects-0.9.1}/PKG-INFO

@@ -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 → photo_objects-0.9.1}/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-0.9.0 → photo_objects-0.9.1}/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-0.9.0 → photo_objects-0.9.1}/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-0.9.0 → photo_objects-0.9.1}/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-0.9.0 → photo_objects-0.9.1}/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 → photo_objects-0.9.1}/photo_objects.egg-info/PKG-INFO

@@ -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 → photo_objects-0.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.9.0"
+version = "0.9.1"
 dependencies = [
     "markdown~=3.7",
     "minio~=7.2",