Merge Dev

django_chunk_file_upload/__init__.py

@@ -1,5 +1,5 @@
 __title__ = "django-chunk-file-upload"
-__version__ = "1.0.0"
+__version__ = "1.0.2"
 __author__ = "Tu Pham"
 __license__ = "MIT"
 __copyright__ = "Copyright 2024 Tu Pham and contributors"

django_chunk_file_upload/app_settings.py

@@ -67,7 +67,7 @@ def from_kwargs(cls, **kwargs) -> "_LazySettings":
         if image_optimizer and isinstance(image_optimizer, dict):
             kwargs["image_optimizer"] = _ImageSettings.from_kwargs(**image_optimizer)
 
-        permission_classes = kwargs.pop("permission_classes")
+        permission_classes = kwargs.pop("permission_classes", None)
         if permission_classes and isinstance(
             permission_classes, (tuple, list, set, str)
         ):

django_chunk_file_upload/migrations/0003_rename_file_manager_checksum_idx_filemanager_checksum_idx.py

@@ -1,6 +1,7 @@
 # Generated by Django 5.0.7 on 2024-08-28 02:33
 
-from django.db import migrations
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -15,4 +16,15 @@ class Migration(migrations.Migration):
             new_name="filemanager_checksum_idx",
             old_name="file_manager_checksum_idx",
         ),
+        migrations.AlterField(
+            model_name="filemanager",
+            name="user",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=models.deletion.SET_NULL,
+                related_name="%(class)s_files",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
     ]

django_chunk_file_upload/models.py

@@ -32,7 +32,7 @@ class FileManagerMixin(models.Model):
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        related_name="files",
+        related_name="%(class)s_files",
     )
     metadata = models.JSONField(default=dict)
 

django_chunk_file_upload/typed.py

@@ -171,7 +171,7 @@ def path(self, value: str) -> None:
 
     @property
     def save_path(self) -> str:
-        return get_save_file_path(self.path)
+        return get_save_file_path(self.path, self._upload_to)
 
     @property
     def extension(self) -> str:

requirements.txt

@@ -1 +1,2 @@
 Django>=3.2
+pillow~=10.4.0

setup.cfg

@@ -50,6 +50,7 @@ packages = find:
 python_requires = >=3.9
 install_requires =
     Django >= 3.2
+    pillow~=10.4.0
 
 [options.packages.find]
 exclude =