rename all occurrences: dummy_obj -> proxy_obj

rename all occurrences: dummy_obj -> proxy_obj

Author: jrief

finder/admin/folder.py

@@ -13,7 +13,7 @@
 
 from finder.models.file import InodeModel, FileModel
 from finder.models.folder import FolderModel, PinnedFolder
-from finder.models.inode import DiscardedInode
+from finder.models.inode import DiscardedInode, InodeManager
 from finder.models.label import Label
 
 from .inode import InodeAdmin
@@ -283,10 +283,10 @@ def move_inodes(self, request, folder_id):
                     DiscardedInode.objects.get(inode=entry['id']).delete()
                 except DiscardedInode.DoesNotExist:
                     pass
-                dummy_obj = FolderModel.objects.get_proxy_object(entry)
-                dummy_obj.parent = target_folder
-                dummy_obj.validate_constraints()
-                dummy_obj._meta.model.objects.filter(id=entry['id']).update(parent=target_folder)
+                proxy_obj = InodeManager.get_proxy_object(entry)
+                proxy_obj.parent = target_folder
+                proxy_obj.validate_constraints()
+                proxy_obj._meta.model.objects.filter(id=entry['id']).update(parent=target_folder)
         except ValidationError as e:
             return HttpResponseBadRequest(e.message, status=409)
         return JsonResponse({
@@ -339,8 +339,8 @@ def erase_trash_folder(self, request):
         DiscardedInode.objects.filter(inode__in=list(trash_folder_entries.values_list('id', flat=True))).delete()
         for entry in trash_folder_entries:
             # bulk delete does not work here because file must be erased from disk
-            dummy_obj = FolderModel.objects.get_proxy_object(entry)
-            dummy_obj.delete()
+            proxy_obj = InodeManager.get_proxy_object(entry)
+            proxy_obj.delete()
         fallback_folder = self.get_fallback_folder(request)
         return JsonResponse({
             'success_url': reverse(

finder/lookups.py

@@ -1,6 +1,4 @@
-from django.urls import reverse
-
-from finder.models.folder import FolderModel
+from finder.models.inode import InodeManager
 from finder.models.label import Label
 
 
@@ -11,13 +9,13 @@ def annotate_unified_queryset(queryset):
     """
     labels = Label.objects.values_list('id', 'name', 'color')
     for entry in queryset:
-        dummy_obj = FolderModel.objects.get_proxy_object(entry)
+        proxy_obj = InodeManager.get_proxy_object(entry)
         entry.update(
-            download_url=dummy_obj.get_download_url(),
-            thumbnail_url=dummy_obj.get_thumbnail_url(),
-            sample_url=getattr(dummy_obj, 'get_sample_url', lambda: None)(),
-            summary=dummy_obj.summary,
-            folderitem_component=dummy_obj.folderitem_component,
+            download_url=proxy_obj.get_download_url(),
+            thumbnail_url=proxy_obj.get_thumbnail_url(),
+            sample_url=getattr(proxy_obj, 'get_sample_url', lambda: None)(),
+            summary=proxy_obj.summary,
+            folderitem_component=proxy_obj.folderitem_component,
         )
         if label_ids := entry.pop('label_ids', None):
             label_ids = list(map(int, label_ids.split(',')))

finder/models/folder.py

@@ -219,7 +219,7 @@ def retrieve(self, path):
             path = path.split('/')
         for part in path:
             if entry := self.listdir(name=part).first():
-                proxy_obj = InodeModel.objects.get_proxy_object(entry)
+                proxy_obj = InodeManagerMixin.get_proxy_object(entry)
                 return proxy_obj.retrieve(path[1:])
             return None
         else:

finder/models/inode.py

@@ -140,13 +140,14 @@ def get_inode(self, **lookup):
         ]).get()
         return FileModel.objects.get_model_for(values['mime_type']).objects.get(id=values['id'])
 
+    @classmethod
     def get_proxy_object(self, entry):
         """
         Returns a proxy model instance for the given entry. This can be useful for entries returned by
-        `filter_unified` since they are dictionaries and not model instances. It hence is an alternative
-        to the `get_inode` method but without querying the database.
-        Please note that such an object does not dereference related fields and can only be used
-        to access their model methods
+        `filter_unified` since they are dictionaries and not model instances. It hence is a faster
+        alternative to the `get_inode` method because it does not query the database.
+        Note that such an object does not dereference related fields and can only be used
+        to access their model members and methods.
         """
         from .file import FileModel
         from .folder import FolderModel