move payload across ambits

Author: jrief

finder/admin/ambit.py

@@ -13,23 +13,6 @@
 from finder.models.ambit import AmbitModel
 
 
-# class XXXAmbitAdmin(ModelAdmin):
-#     def XXXhas_add_permission(self, request):
-#         return False
-#
-#     def change_view(self, request, object_id, form_url=None, extra_context=None):
-#         return super().change_view(request, object_id, form_url, extra_context)
-#
-#     def changelist_view(self, request, extra_context=None):
-#         ambit = AmbitModel.objects.get(name=self.model._meta.model_name)
-#         # always redirect the list view to the detail view of either the latest used, or the root folder
-#         return HttpResponsePermanentRedirect(reverse(
-#             'admin:finder_inodemodel_change',
-#             args=(ambit.root_folder.id,),
-#             current_app=self.admin_site.name,
-#         ))
-
-
 def get_ambit_queryset(admin_name, current_site):
     return AmbitModel.objects.filter(
         Q(site=current_site) | Q(site__isnull=True),

finder/models/folder.py

@@ -197,10 +197,11 @@ def listdir(self, **lookup):
 
     def move_inodes(self, inode_ids):
         """
-        Move all Inodes with the given IDs to the end of this folder.
+        Move all Inodes with the given IDs to the end of the current folder.
         """
         parent_ids = set()
         update_inodes = {}
+        target_ambit, cache_ambits = self.get_ambit(), {}
         entries = FolderModel.objects.filter_unified(id__in=inode_ids)
         for ordering, entry in enumerate(entries, self.get_max_ordering() + 1):
             parent_ids.add(entry['parent'])
@@ -213,6 +214,15 @@ def move_inodes(self, inode_ids):
             proxy_obj.ordering = ordering
             proxy_obj.validate_constraints()
             update_inodes.setdefault(proxy_obj._meta.concrete_model, []).append(proxy_obj)
+            if entry['is_folder'] is False:
+                if not (source_ambit := cache_ambits.get(entry['parent'])):
+                    source_ambit = FolderModel.objects.get(id=entry['parent']).get_ambit()
+                    cache_ambits[entry['parent']] = source_ambit
+                if target_ambit.id is not source_ambit.id:
+                    # move payload from source_ambit to target_ambit and delete from source_ambit
+                    with source_ambit.original_storage.open(proxy_obj.file_path, 'rb') as readhandle:
+                        target_ambit.original_storage.save(proxy_obj.file_path, readhandle)
+                    source_ambit.original_storage.delete(proxy_obj.file_path)
 
         with transaction.atomic():
             for concrete_model, proxy_objects in update_inodes.items():