django-pfx 1.4.dev134__tar.gz → 1.4.dev138__tar.gz

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev134
+Version: 1.4.dev138
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev134
+Version: 1.4.dev138
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/pfx/pfxcore/fields/media_field.py

@@ -3,7 +3,7 @@ from importlib import import_module
 from urllib.request import urlopen
 
 from django.db import models
-from django.db.models.signals import post_delete
+from django.db.models.signals import post_delete, post_init
 from django.dispatch import receiver
 
 from pfx.pfxcore.shortcuts import settings
@@ -27,6 +27,7 @@ class MediaField(models.JSONField):
                 "class on the field or define STORAGE_DEFAULT settings.")
         self.storage = storage or get_storage_class(settings.STORAGE_DEFAULT)
         self.auto_delete = auto_delete
+        self._db_value = None
         super().__init__(
             *args, max_length=max_length, **kwargs)
 
@@ -34,24 +35,28 @@ class MediaField(models.JSONField):
     def get_default_key(obj, filename):
         return f"{type(obj).__name__}/{obj.pk}/{filename}"
 
-    def clean(self, value, obj):
+    def media_pre_save(self, obj):
         def save_file(obj, file, name):
             setattr(obj, self.name, self.upload(obj, file, name))
             obj.save(update_fields={self.name})
 
+        after_save = []
+        value = self.value_from_object(obj)
         if isinstance(value, dict):
-            toDelete = value.pop('toDelete', None)
             b64 = value.pop('base64', None)
             name = value.get('name')
-            if toDelete:
-                obj._after_save.append(lambda: self.delete(toDelete))
-                value = None
-            if b64:
-                with urlopen(b64) as response:
-                    file = response.read()
-                value = dict(key=self.get_key(obj, file))
-                obj._after_save.append(lambda: save_file(obj, file, name))
-        return super().clean(value, obj)
+        else:
+            b64 = None
+
+        if self._db_value and (b64 or not value):
+            after_save.append(lambda: self.delete(self._db_value))
+            setattr(obj, self.name, None)
+        if b64:
+            with urlopen(b64) as response:
+                file = response.read()
+            setattr(obj, self.name, dict(key=self.get_key(obj, file)))
+            after_save.append(lambda: save_file(obj, file, name))
+        return after_save
 
     def to_python(self, value):
         return super().to_python(self.storage.to_python(value))
@@ -73,6 +78,13 @@ class MediaField(models.JSONField):
         return self.storage.delete(value)
 
 
+@receiver(post_init)
+def post_init_media(sender, instance, **kwargs):
+    for field in sender._meta.fields:
+        if isinstance(field, MediaField):
+            field._db_value = field.value_from_object(instance)
+
+
 @receiver(post_delete)
 def post_delete_media(sender, instance, **kwargs):
     for field in sender._meta.fields:

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-21 12:41+0200\n"
+"POT-Creation-Date: 2025-06-17 08:53+0200\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -272,7 +272,7 @@ msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 msgid "Invalid value for {filter} filter"
 msgstr "Valeur invalide pour le filtre {filter}"
 
-#: views/media_rest_view_mixin.py:37 views/media_rest_view_mixin.py:123
+#: views/media_rest_view_mixin.py:37 views/media_rest_view_mixin.py:130
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"
 
@@ -292,17 +292,17 @@ msgid "{obj} cannot be deleted because it is referenced by other objects."
 msgstr ""
 "{obj} ne peut pas être supprimé car il est référencé par d’autres objets."
 
-#: views/rest_views.py:319
+#: views/rest_views.py:331
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:320
+#: views/rest_views.py:332
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1169
+#: views/rest_views.py:1182
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/pfx/pfxcore/views/media_rest_view_mixin.py

@@ -59,6 +59,13 @@ def get_media_field_response(obj, field, request):
 class MediaRestViewMixin(ModelMixin):
     """Extension mixin to manage media fields."""
 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        self.media_fields = set()
+        for field in self.model._meta.fields:
+            if isinstance(field, MediaField):
+                self.media_fields.add(field)
+
     @rest_api(
         "/<int:pk>/<str:field>/upload-url/<str:filename>", method="get",
         priority_doc=-8)
@@ -165,6 +172,12 @@ class MediaRestViewMixin(ModelMixin):
         obj = self.get_object(pk=pk)
         return get_media_field_response(obj, field, self.request)
 
+    def pre_save(self, obj, created=False):
+        funcs = super().pre_save(obj, created=created)
+        for field in self.media_fields:
+            funcs.extend(field.media_pre_save(obj))
+        return funcs
+
 
 class MediaPermsRestViewMixin(MediaRestViewMixin):
     """Extension mixin to check permissions."""

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/pfx/pfxcore/views/rest_views.py

@@ -247,6 +247,18 @@ class ModelMixin():
         """
         return model_permissions(cls.model, actions)
 
+    def pre_save(self, obj, created=False):
+        """Return a list of function to call in post_save.
+        """
+        return []
+
+    def post_save(self, obj, created=False, funcs=None):
+        """Post save operations.
+        """
+        funcs = funcs or []
+        for func in funcs:
+            func()
+
 
 class ModelResponseMixin(ModelMixin):
     """Extension of :class:`ModelMixin` to manage object responses."""
@@ -339,17 +351,13 @@ class ModelResponseMixin(ModelMixin):
         :returns: The JSON response
         :rtype: :class:`JsonResponse`
         """
-        if rel_data or obj._after_save:
-            with transaction.atomic():
-                obj.save()
-                if rel_data:
-                    for k, v in rel_data.items():
-                        getattr(obj, k).set(v)
-                for callback in obj._after_save:
-                    callback()
-                obj._after_save = []
-        else:
+        with transaction.atomic():
+            funcs = self.pre_save(obj, created=created)
             obj.save()
+            if rel_data:
+                for k, v in rel_data.items():
+                    getattr(obj, k).set(v)
+            self.post_save(obj, created=created, funcs=funcs)
         obj = self.get_object(pk=obj.pk)
         return self.response(
             obj, **self.is_valid_response_meta(obj, created=created))
@@ -855,10 +863,15 @@ class ListRestViewMixin(ModelResponseMixin):
         elif settings.PFX_MAX_LIST_RESULT_SIZE:
             qs = qs[:settings.PFX_MAX_LIST_RESULT_SIZE]
         if get_bool(self.request.GET, 'items', 'count' not in meta):
-            if self.request.GET.get('mode', 'list') == 'select':
-                res['items'] = list(self.get_short_list_result(qs))
-            else:
-                res['items'] = list(self.get_list_result(qs))
+            mode = self.request.GET.get('mode', 'list')
+            match mode:
+                case 'list':
+                    res['items'] = list(self.get_list_result(qs))
+                case 'select':
+                    res['items'] = list(self.get_short_list_result(qs))
+                case _:
+                    m = f'get_{mode}_result'
+                    res['items'] = list(getattr(self, m)(qs))
         meta.update(self._get_list_extra_meta(res))
         if meta:
             res['meta'] = meta

{django_pfx-1.4.dev134 → django_pfx-1.4.dev138}/tests/tests/basic_api_test.py

@@ -732,13 +732,11 @@ class BasicAPITest(TestAssertMixin, TestCase):
             'bca20547e94049e1ffea27223581c567022a5774.txt').exists())
 
         # Replace file
-        old_file = self.get_val(response, 'local_file')
         response = self.client.put(f'/api/books/{book_pk}', dict(
             local_file=dict(
                 name='test2.txt',
                 base64='data:text/plain;charset=utf-8;'
-                'base64,TmV3IGNvbnRlbnQ=',
-                toDelete=old_file)))
+                'base64,TmV3IGNvbnRlbnQ=')))
         self.assertRC(response, 200)
         self.assertJE(
             response, 'local_file.key',
@@ -752,9 +750,8 @@ class BasicAPITest(TestAssertMixin, TestCase):
             'af9f06b2b3b1546ac44f4a02994d0ef09e074b91.txt').exists())
 
         # Delete file
-        old_file = self.get_val(response, 'local_file')
         response = self.client.put(f'/api/books/{book_pk}', dict(
-            local_file=dict(toDelete=old_file)))
+            local_file=None))
         self.assertRC(response, 200)
         self.assertJE(response, 'local_file', None)
         self.assertFalse(Path(