refactor property concrete_models into function get_models

refactor property concrete_models into function get_models

Author: jrief

finder/admin/file.py

@@ -11,6 +11,7 @@
 from entangled.forms import EntangledModelForm
 
 from finder.models.file import FileModel
+from finder.models.inode import InodeModel
 from finder.models.label import Label
 from finder.admin.inode import InodeAdmin
 
@@ -59,7 +60,7 @@ def get_urls(self):
             ),
         ]
         urls.extend(super().get_urls())
-        for model in FileModel.file_models:
+        for model in InodeModel.get_models(include_proxy=True):
             if model_admin := self.admin_site._registry.get(model):
                 urls.extend(model_admin.get_editor_urls())
         return urls

finder/admin/folder.py

@@ -87,7 +87,7 @@ def get_urls(self):
             ),
         ]
         urls.extend(default_urls)
-        for model in InodeModel.file_models:
+        for model in InodeModel.get_models(include_proxy=True):
             if model_admin := self.admin_site._registry.get(model):
                 urls.extend(model_admin.get_menu_extension_urls())
         return urls
@@ -149,7 +149,7 @@ def get_editor_settings(self, request, inode):
 
     def get_menu_extension_settings(self, request):
         extensions = []
-        for model in InodeModel.file_models:
+        for model in InodeModel.get_models(include_proxy=True):
             if model_admin := self.admin_site._registry.get(model):
                     extension = model_admin.get_menu_extension_settings(request)
                     if extension.get('component'):
@@ -218,14 +218,15 @@ def upload_file(self, request, folder_id):
             return HttpResponseBadRequest(f"Method {request.method} not allowed. Only POST requests are allowed.")
         if not (folder := self.get_object(request, folder_id)):
             return HttpResponseNotFound(f"Folder {folder_id} not found.")
-        if request.content_type == 'multipart/form-data' and 'upload_file' in request.FILES:
-            model = FileModel.objects.get_model_for(request.FILES['upload_file'].content_type)
-            new_file = model.objects.create_from_upload(
-                request.FILES['upload_file'],
-                folder=folder,
-                owner=request.user,
-            )
-        return HttpResponse(f"Uploaded {new_file.name} successfully.")
+        if request.content_type != 'multipart/form-data' or 'upload_file' not in request.FILES:
+            return HttpResponseBadRequest("Bad encoding type or missing payload.")
+        model = FileModel.objects.get_model_for(request.FILES['upload_file'].content_type)
+        new_file = model.objects.create_from_upload(
+            request.FILES['upload_file'],
+            folder=folder,
+            owner=request.user,
+        )
+        return JsonResponse({'uploaded_file': new_file.as_dict})
 
     def update_inode(self, request, folder_id):
         if response := self.check_for_valid_post_request(request, folder_id):

finder/admin/inode.py

@@ -39,7 +39,7 @@ def get_urls(self):
 
     def get_object(self, request, object_id, from_field=None):
         site = get_current_site(request)
-        for model in InodeModel.concrete_models:
+        for model in InodeModel.get_models(include_folder=True):
             try:
                 obj = model.objects.get(id=object_id)
                 if obj.is_folder and obj.realm.site == site and obj.realm.slug == self.admin_site.name:
@@ -124,7 +124,7 @@ def get_inodes(self, request, sorting=None, **lookup):
         """
         inodes, applicable_sorting = [], []
         labels = lookup.pop('labels__in', None)
-        for inode_model in InodeModel.concrete_models:
+        for inode_model in InodeModel.get_models(include_folder=True):
             queryset = (
                 inode_model.objects.select_related('owner')
                 .filter(**lookup)

finder/api/views.py

@@ -182,7 +182,7 @@ def search(self, request, folder_id):
         sorting = self.sorting_map.get(request.COOKIES.get('django-finder-sorting'))
 
         files = []
-        for file_model in AbstractFileModel.concrete_models:
+        for file_model in InodeModel.get_models():
             queryset = file_model.objects.filter(**lookup)
             if sorting:
                 queryset = queryset.order_by(sorting[0])
@@ -208,7 +208,7 @@ def upload(self, request, folder_id):
             raise BadRequest(f"Method {request.method} not allowed. Only POST requests are allowed.")
         if request.content_type != 'multipart/form-data' or 'upload_file' not in request.FILES:
             raise BadRequest("Bad form encoding or missing payload.")
-        model = AbstractFileModel.objects.get_model_for(request.FILES['upload_file'].content_type)
+        model = FileModel.objects.get_model_for(request.FILES['upload_file'].content_type)
         folder = FolderModel.objects.get(id=folder_id)
         file = model.objects.create_from_upload(
             request.FILES['upload_file'],

finder/contrib/archive/admin.py

@@ -12,7 +12,7 @@
 
 from finder.admin.file import FileAdmin
 from finder.contrib.archive.models import ArchiveModel
-from finder.models.file import FileModel
+from finder.models.file import FileModel, AbstractFileModel
 from finder.models.folder import FolderModel
 
 

finder/management/commands/reorganize_finder.py

@@ -14,9 +14,7 @@ def handle(self, verbosity, *args, **options):
         self.reorganize()
 
     def reorganize(self):
-        for inode_model in InodeModel.concrete_models:
-            if inode_model.is_folder:
-                continue
+        for inode_model in InodeModel.get_models():
             for file in inode_model.objects.all():
                 file_model = FileModel.objects.get_model_for(file.mime_type)
                 if not issubclass(file_model, file.__class__):

finder/models/file.py

@@ -9,7 +9,7 @@
 from django.core.files.storage import default_storage
 from django.db import models
 from django.template.defaultfilters import filesizeformat
-from django.utils.functional import cached_property
+from django.utils.functional import cached_property, classproperty
 from django.utils.translation import gettext_lazy as _
 
 from filer import settings as filer_settings
@@ -42,7 +42,7 @@ def create_from_upload(self, uploaded_file, **kwargs):
 
     def get_model_for(self, mime_type):
         def lookup(mime_type):
-            for model in InodeModel.file_models:
+            for model in InodeModel.get_models(include_proxy=True):
                 if mime_type in model.accept_mime_types:
                     return model
             return None
@@ -174,6 +174,15 @@ def get_thumbnail_url(self):
         """
         return self.fallback_thumbnail_url
 
+    # @classproperty
+    # def concrete_models(cls):
+    #     """
+    #     Yields all concrete (excluding proxy models) that inherit from AbstractFileModel.
+    #     """
+    #     for model in cls._inode_models.values():
+    #         if not model.is_folder and not model._meta.proxy:
+    #             yield model
+
     @cached_property
     def mime_maintype(self):
         return self.mime_type.split('/')[0]
@@ -226,15 +235,6 @@ def delete(self, using=None, keep_parents=False):
             default_storage.delete(self.file_path)
         super().delete(using, keep_parents)
 
-    @property
-    def concrete_models(self):
-        """
-        Yields all concrete (excluding proxy models) that inherit from AbstractFileModel.
-        """
-        for model in self._inode_models.values():
-            if not model.is_folder and not model._meta.proxy:
-                yield model
-
 
 class FileModel(AbstractFileModel):
     """

finder/models/folder.py

@@ -87,7 +87,7 @@ def subfolders(self):
     def num_children(self):
         num_children = sum(
             inode_model.objects.filter(parent=self).count()
-            for inode_model in InodeModel.concrete_models
+            for inode_model in InodeModel.get_models(include_folder=True)
         )
         return num_children
 

finder/models/inode.py

@@ -47,22 +47,14 @@ def _validate_accept_mime_types(new_class):
                     raise ImproperlyConfigured(msg.format(accept_mime_type, other))
             new_class._mime_types_mapping[accept_mime_type] = new_class
 
-    @property
-    def concrete_models(self):
+    def get_models(self, include_proxy=False, include_folder=False):
         """
-        Yields all concrete (excluding proxy models) that inherit from InodeModel.
+        Yields all models that inherit from InodeModel.
+        If `include_proxy` is True, all proxy models are included.
+        If `include_folder` is True, the `FolderModel` is included.
         """
         for model in self._inode_models.values():
-            if not model._meta.proxy:
-                yield model
-
-    @property
-    def file_models(cls):
-        """
-        Returns all models (including proxy models) that inherit from AbstractFileModel.
-        """
-        for model in cls._inode_models.values():
-            if not model.is_folder:
+            if (not model._meta.proxy or include_proxy) and (not model.is_folder or include_folder):
                 yield model
 
 
@@ -72,14 +64,11 @@ class InodeManagerMixin:
     """
 
     def filter_inodes(self, **lookup):
-        from .file import AbstractFileModel
         from .folder import FolderModel
 
-        is_folder = lookup.pop('is_folder', None)
-        if is_folder:
+        if is_folder := lookup.pop('is_folder', None):
             return FolderModel.objects.filter(**lookup).iterator()
-        # `is_folder` may be None (all models) or False (only files)
-        concrete_models = AbstractFileModel.concrete_models if is_folder is False else InodeModel.concrete_models
+        concrete_models = InodeModel.get_models(include_folder=is_folder is None)
         inodes = [inode_model.objects.filter(**lookup) for inode_model in concrete_models]
         return chain(*inodes)