chroot merge and zip FS

b3b00 · May 16, 2023 · 8be7b87 · 8be7b87
1 parent baccc90
commit 8be7b87
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/SharpCoreFileSystem/FileSystems/AbstractFileSystem.cs b/SharpCoreFileSystem/FileSystems/AbstractFileSystem.cs
@@ -23,7 +23,7 @@ public ICollection<FileSystemPath> GetFiles(FileSystemPath path)
 
 
 
-        public void ChRoot(FileSystemPath newRoot)
+        public virtual void ChRoot(FileSystemPath newRoot)
         {
             Root = newRoot;
         }

diff --git a/SharpCoreFileSystem/FileSystems/MergedFileSystem.cs b/SharpCoreFileSystem/FileSystems/MergedFileSystem.cs
@@ -83,5 +83,14 @@ public override void Delete(FileSystemPath path)
             foreach(var fs in FileSystems.Where(fs => fs.Exists(path)))
                 fs.Delete(path);
         }
+
+        public override void ChRoot(FileSystemPath root)
+        {
+            Root = root;
+            foreach (var fileSystem in FileSystems)
+            {
+                fileSystem.ChRoot(root);
+            }
+        }
     }
 }
diff --git a/SharpCoreFileSystem/FileSystems/NetZipArchiveFileSystem.cs b/SharpCoreFileSystem/FileSystems/NetZipArchiveFileSystem.cs
@@ -47,6 +47,12 @@ protected FileSystemPath ToPath(ZipArchiveEntry entry)
         protected string ToEntryPath(FileSystemPath path)
         {
             // Remove heading '/' from path.
+            string rootedPath = path;
+            if (!Root.IsRoot)
+            {
+                rootedPath = Path.Combine(Root, path);
+            }
+
             return path.Path.TrimStart(FileSystemPath.DirectorySeparator);
         }