fix: unarchiving of zip files

Author: jrief

finder/contrib/archive/admin.py

@@ -59,7 +59,10 @@ def archive_selected(self, request, folder_id):
                 inode_objects.append(inode_obj)
                 if inode_obj.is_folder:
                     for descendant in inode_obj.descendants:
-                        inode_objects.extend(descendant.listdir())
+                        inode_objects.extend(
+                            FileModel.objects.get_inode(id=entry['id'])
+                            for entry in descendant.listdir()
+                        )
 
         filename = self.model.generate_filename(body['archive_name'])
         filename = f'{filename}.zip' if not filename.endswith('.zip') else filename

finder/models/folder.py

@@ -7,6 +7,7 @@
 from django.utils.functional import cached_property
 from django.utils.translation import gettext, gettext_lazy as _, ngettext
 
+
 try:
     from django_cte import CTEManager as ModelManager
 except ImportError:
@@ -217,8 +218,9 @@ def retrieve(self, path):
         if isinstance(path, str):
             path = path.split('/')
         for part in path:
-            if inodes := self.listdir(name=part):
-                return next(inodes).retrieve(path[1:])
+            if entry := self.listdir(name=part).first():
+                proxy_obj = InodeModel.objects.get_proxy_object(entry)
+                return proxy_obj.retrieve(path[1:])
             return None
         else:
             return self