Merge branch 'dev' of https://github.com/thewebscraping/django-chunk-file-upload into dev

Author: thewebscraping

.gitignore

@@ -56,3 +56,4 @@ docs/_build
 .DS_Store
 examples/.DS_Store
 examples/db.sqlite3
+examples/media/

django_chunk_file_upload/admin.py

@@ -11,6 +11,7 @@ class FileManagerModelAdmin(admin.ModelAdmin):
     form = ChunkedUploadFileAdminForm
     list_display = (
         "id",
+        "name",
         "status",
         "created_at",
         "updated_at",

django_chunk_file_upload/migrations/0003_rename_file_manager_checksum_idx_filemanager_checksum_idx.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.7 on 2024-08-28 02:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_chunk_file_upload", "0002_alter_filemanager_options_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameIndex(
+            model_name="filemanager",
+            new_name="filemanager_checksum_idx",
+            old_name="file_manager_checksum_idx",
+        ),
+    ]

django_chunk_file_upload/models.py

@@ -7,7 +7,9 @@
 from .constants import StatusChoices, TypeChoices
 
 
-class FileManager(models.Model):
+class FileManagerMixin(models.Model):
+    """File Manager Mixin for Django Models"""
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
     file = models.FileField()
@@ -34,9 +36,25 @@ class FileManager(models.Model):
     )
     metadata = models.JSONField(default=dict)
 
+    class Meta:
+        abstract = True
+
+    def __str__(self):
+        return self.name
+
+    @property
+    def name(self) -> str:
+        if "name" in self.metadata and self.metadata["name"]:
+            return self.metadata["name"]
+        return self.file.name
+
+
+class FileManager(FileManagerMixin):
+    """File Manager for Django Models"""
+
     class Meta:
         db_table = "django_chunk_file_upload"
-        indexes = [models.Index(fields=["checksum"], name="file_manager_checksum_idx")]
+        indexes = [models.Index(fields=["checksum"], name="%(class)s_checksum_idx")]
         ordering = ("-created_at",)
         unique_together = (
             "user",

django_chunk_file_upload/permissions.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+
 class BasePermission:
     safe_methods = ("GET", "POST", "DELETE")
 

django_chunk_file_upload/static/js/upload.chunk.js

@@ -136,7 +136,6 @@ function deleteFile() {
           processData: false,
           contentType: false,
           error: function (response) {
-            console.log(response)
             let errorMessage = response.statusText;
             if (response.responseJSON) {
               errorMessage = response.responseJSON.message;

django_chunk_file_upload/templates/django_chunk_file_upload/forms/widgets/drag_drop_input.html

@@ -1,4 +1,4 @@
-{% load i18n admin_tags %}
+{% load i18n %}
 <div class="dropzone-wrapper">
     <div class="loader hide"></div>
     {% if widget.is_initial %}

django_chunk_file_upload/typed.py

@@ -147,7 +147,7 @@ def file(self) -> Union[InMemoryUploadedFile, TemporaryUploadedFile, None]:
 
     @property
     def filename(self) -> str:
-        return get_filename(self.file.name)
+        return get_filename(getattr(self.file, "name", "")) or ""
 
     @property
     def repl_filename(self) -> str:
@@ -236,11 +236,10 @@ def to_private_attrs():
                 user = request.user
 
             file = request.FILES.get("file")
-            extension = get_file_extension(file.name)
             pk = make_uuid(user=user, checksum=request.headers.get("x-file-checksum"))
             return {
                 "_id": pk,
-                "_extension": extension,
+                "_extension": get_file_extension(file.name) if file else None,
                 "_file": file,
                 "_user": user,
                 "_upload_to": upload_to,
@@ -291,6 +290,7 @@ def to_metadata(self) -> dict:
     def to_response(self) -> dict:
         metadata = {k: v for k, v in self.to_dict().items() if not k.startswith("_")}
         metadata["message"] = str(self.message)
+        metadata["name"] = self.filename
         return metadata
 
     def write(self, mode: str = "ab+"):

django_chunk_file_upload/views.py

@@ -62,6 +62,11 @@ def has_change_permission(self, request, obj=None) -> bool:
     def has_delete_permission(self, request, obj=None) -> bool:
         return self.check_object_permissions(request)
 
+    def is_valid(self, form, file_obj) -> bool:
+        if form.is_valid() and file_obj.is_valid():
+            return True
+        return False
+
     def get_model(self):
         return self.form_class.Meta.model
 
@@ -97,18 +102,7 @@ def post(self, request, *args, **kwargs):
     def delete(self, request, *args, **kwargs):
         """Override DELETE method from View."""
 
-        form, file_obj = self._get_form_file(request, *args, **kwargs)
-        if self.has_delete_permission(request):
-            instance = self.get_instance()
-            if instance and (
-                self.request.user.is_superuser or self.request.user == instance.user
-            ):
-                self._delete(instance)
-                file_obj.message = _("The file deleted successfully.")
-                return self.ajax_response(None, file_obj, status=200, save=False)
-
-        file_obj.message = _("Permission denied.")
-        return self.ajax_response(None, file_obj, status=400, save=False)
+        return self._delete(request, *args, **kwargs)
 
     def _get(self, request, *args, **kwargs):
         if self.has_view_permission(request):
@@ -117,11 +111,7 @@ def _get(self, request, *args, **kwargs):
 
     def _post(self, request, *args, **kwargs):
         form, file_obj = self._get_form_file(request, *args, **kwargs)
-        if (
-            self.has_add_permission(self.request)
-            and file_obj.is_valid()
-            and form.is_valid()
-        ):
+        if self.has_add_permission(self.request) and self.is_valid(form, file_obj):
             instance = self.get_instance()
             return self.chunked_upload(instance, form, file_obj)
 
@@ -130,7 +120,7 @@ def _post(self, request, *args, **kwargs):
 
     def _update(self, request, *args, **kwargs):
         form, file_obj = self._get_form_file(request, *args, **kwargs)
-        if self.has_change_permission(self.request):
+        if self.has_change_permission(self.request) and self.is_valid(form, file_obj):
             instance = self.get_instance()
             if instance:
                 if self.remove_file_on_update:
@@ -145,10 +135,20 @@ def _update(self, request, *args, **kwargs):
         file_obj.message = _("Permission denied.")
         return self.ajax_response(None, file_obj, status=400, save=False)
 
-    def _delete(self, instance):
-        if instance:
-            instance.file.delete()
-            instance.delete()
+    def _delete(self, request, *args, **kwargs):
+        form, file_obj = self._get_form_file(request, *args, **kwargs)
+        if self.has_delete_permission(request):
+            instance = self.get_instance()
+            if instance and (
+                self.request.user.is_superuser or self.request.user == instance.user
+            ):
+                instance.file.delete()
+                instance.delete()
+                file_obj.message = _("The file deleted successfully.")
+                return self.ajax_response(None, file_obj, status=200, save=False)
+
+        file_obj.message = _("Permission denied.")
+        return self.ajax_response(None, file_obj, status=400, save=False)
 
     def _get_form_file(
         self, request, *args, **kwargs

django_chunk_file_upload/widgets.py

@@ -11,6 +11,7 @@ class DragDropFileInput(forms.ClearableFileInput):
 
     def get_context(self, name, value, attrs):
         context = super().get_context(name, value, attrs)
+        context["widget"]["attrs"]["required"] = False
         context["widget"]["attrs"]["hidden"] = True
         context["widget"]["attrs"]["data-id"] = "dropzone"
         if value and isinstance(value, (FieldFile, ImageField)):