reverse relation from Folder to Realm-Models

Author: jrief

finder/admin/folder.py

@@ -190,7 +190,7 @@ def fetch_inodes(self, request, folder_id):
     def search_for_inodes(self, request, current_folder, search_query, **lookup):
         search_realm = request.COOKIES.get('django-finder-search-realm')
         if search_realm == 'everywhere':
-            starting_folder = FolderModel.objects.get_root_folder(self.get_realm(request))
+            starting_folder = self.get_realm(request).root_folder
         else:
             starting_folder = current_folder
         if isinstance(starting_folder.descendants, QuerySet):

finder/admin/inode.py

@@ -88,20 +88,21 @@ def serialize_inode(self, inode):
         return data
 
     def get_realm(self, request):
+        site = get_current_site(request)
         try:
-            realm = RealmModel.objects.get(site=get_current_site(request), slug=self.admin_site.name)
+            realm = RealmModel.objects.get(site=site, slug=self.admin_site.name)
         except RealmModel.DoesNotExist:
             root_folder = FolderModel.objects.create(owner=request.user, name='__root__')
             realm = RealmModel.objects.create(
-                site=get_current_site(request),
+                site=site,
                 slug=self.admin_site.name,
                 root_folder=root_folder,
             )
         return realm
 
     def get_root_folder(self, request):
         realm = self.get_realm(request)
-        return FolderModel.objects.get_root_folder(realm)
+        return realm.root_folder
 
     def get_trash_folder(self, request):
         realm = self.get_realm(request)

finder/browser/views.py

@@ -64,13 +64,18 @@ def _get_realm(self, request, slug):
 
     def structure(self, request, slug):
         realm = self._get_realm(request, slug)
-        root_folder = FolderModel.objects.get_root_folder(realm)
-        root_folder_id = str(root_folder.id)
+        root_folder_id = str(realm.root_folder.id)
         request.session.setdefault('finder.open_folders', [])
         request.session.setdefault('finder.last_folder', root_folder_id)
-        if is_open := root_folder.subfolders.exists():
+        last_folder_id = request.session['finder.last_folder']
+        if is_open := realm.root_folder.subfolders.exists():
             # direct children of the root folder are open regardless of the `open_folders` session
-            children = self._get_children(request.session['finder.open_folders'], root_folder)
+            # in addition to that, also open all ancestors of the last opened folder
+            open_folders = set(request.session['finder.open_folders'])
+            open_folders.update(
+                map(str, FolderModel.objects.get(id=last_folder_id).ancestors.values_list('id', flat=True))
+            )
+            children = self._get_children(open_folders, realm.root_folder)
         else:
             children = None
         return {
@@ -172,11 +177,13 @@ def search(self, request, folder_id):
         offset = int(request.GET.get('offset', 0))
         starting_folder = FolderModel.objects.get(id=folder_id)
         search_realm = request.COOKIES.get('django-finder-search-realm')
-        if search_realm == 'everywhere':
-            starting_folder = starting_folder.ancestors[-1]
         if isinstance(starting_folder.descendants, QuerySet):
+            if search_realm == 'everywhere':
+                starting_folder = starting_folder.ancestors.last()
             parent_ids = Subquery(starting_folder.descendants.values('id'))
-        else:
+        else:  # django-cte not installed (slow)
+            if search_realm == 'everywhere':
+                starting_folder = starting_folder.ancestors[-1]
             parent_ids = [descendant.id for descendant in starting_folder.descendants]
 
         lookup = {

finder/management/commands/filer_to_finder.py

@@ -32,7 +32,7 @@ def forward(self):
             realm = FinderRealmModel.objects.create(site=site, slug=admin_site.name, root_folder=root_folder)
 
         for filer_folder in FilerFolder.objects.filter(parent__isnull=True):
-            self.migrate_folder(filer_folder, FinderFolder.objects.get_root_folder(realm))
+            self.migrate_folder(filer_folder, realm.root_folder)
 
     def migrate_folder(self, filer_folder, finder_parent):
         finder_folder = finder_parent.listdir(name=filer_folder.name, is_folder=True).first()

finder/models/folder.py

@@ -18,13 +18,6 @@
 
 
 class FolderModelManager(InodeManagerMixin, ModelManager):
-    def get_root_folder(self, realm):
-        try:
-            return realm.root_folder
-        except FolderModel.DoesNotExist:
-            realm.root_folder = self.create(parent=None, name='__root__')
-            return realm.root_folder
-
     def get_trash_folder(self, realm, owner):
         try:
             trash_folder = realm.trash_folders.get(owner=owner)