Fix leading slash in ZIP archive (#103)

* Fix leading slash in ZIP archive

* Typo

Author: GerardSmit

src/Zio.Tests/FileSystems/TestZipArchiveFileSystem.cs

@@ -231,8 +231,8 @@ public void TestOpenStreamsMultithreaded()
 
 
     [Theory]
-    [InlineData("TestData/Linux.zip")]
-    [InlineData("TestData/Windows.zip")]
+    [InlineData("TestData/OsZips/Linux.zip")]
+    [InlineData("TestData/OsZips/Windows.zip")]
     public void TestCaseInSensitiveZip(string path)
     {
         using var stream = File.OpenRead(path);
@@ -253,8 +253,8 @@ public void TestCaseInSensitiveZip(string path)
     }
 
     [Theory]
-    [InlineData("TestData/Linux.zip")]
-    [InlineData("TestData/Windows.zip")]
+    [InlineData("TestData/OsZips/Linux.zip")]
+    [InlineData("TestData/OsZips/Windows.zip")]
     public void TestCaseSensitiveZip(string path)
     {
         using var stream = File.OpenRead(path);
@@ -329,4 +329,50 @@ public void TestSaveFile()
             File.Delete(path);
         }
     }
+
+    [Theory]
+    [InlineData("TestData/RootFiles/WithoutRootSlash.zip", false)]
+    [InlineData("TestData/RootFiles/WithRootSlash.zip", true)]
+    public void TestReadDifferentSlash(string zipPath, bool leadingRootSlash)
+    {
+        using var fs = new ZipArchiveFileSystem(zipPath);
+
+        Assert.Equal(leadingRootSlash, fs.LeadingSlashInArchive);
+
+        Assert.True(fs.FileExists("/Test.txt"));
+        Assert.Equal("Test", fs.ReadAllText("/Test.txt"));
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public void TestWriteDifferentSlash(bool leadingRootSlash)
+    {
+        using var memStream = new MemoryStream();
+
+        using (var fs = new ZipArchiveFileSystem(memStream, leaveOpen: true))
+        {
+            fs.LeadingSlashInArchive = leadingRootSlash;
+
+            Assert.Equal(leadingRootSlash, fs.LeadingSlashInArchive);
+
+            fs.WriteAllText("/Test.txt", "Test");
+        }
+
+        memStream.Seek(0, SeekOrigin.Begin);
+
+        using (var fs = new ZipArchiveFileSystem(memStream, leaveOpen: true))
+        {
+            Assert.Equal(leadingRootSlash, fs.LeadingSlashInArchive);
+
+            Assert.True(fs.FileExists("/Test.txt"));
+            Assert.Equal("Test", fs.ReadAllText("/Test.txt"));
+        }
+
+        memStream.Seek(0, SeekOrigin.Begin);
+
+        using var zipArchive = new ZipArchive(memStream, ZipArchiveMode.Read);
+
+        Assert.Equal(leadingRootSlash, zipArchive.Entries[0].FullName.StartsWith("/"));
+    }
 }

src/Zio.Tests/FileSystems/TestZipArchiveFileSystemCompact.cs

@@ -91,6 +91,43 @@ public void TestDirectoryExceptions()
 #endif
     }
 
+    [Fact]
+    public void TestDirectoryDelete()
+    {
+        fs.CreateDirectory("/dir");
+        fs.WriteAllText("/dir/file.txt", "test");
+
+        fs.CreateDirectory("/dir2");
+        fs.WriteAllText("/dir2/file2.txt", "test");
+
+        fs.DeleteDirectory("/dir", isRecursive: true);
+
+        Assert.False(fs.DirectoryExists("/dir"));
+
+        Assert.True(fs.DirectoryExists("/dir2"));
+        Assert.True(fs.FileExists("/dir2/file2.txt"));
+    }
+
+    [Fact]
+    public void TestDirectoryMove()
+    {
+        fs.CreateDirectory("/dir");
+        fs.WriteAllText("/dir/file.txt", "test");
+
+        fs.CreateDirectory("/dir2");
+        fs.WriteAllText("/dir2/file2.txt", "test");
+
+        fs.MoveDirectory("/dir", "/moved");
+
+        Assert.False(fs.DirectoryExists("/dir"));
+
+        Assert.True(fs.DirectoryExists("/moved"));
+        Assert.True(fs.FileExists("/moved/file.txt"));
+
+        Assert.True(fs.DirectoryExists("/dir2"));
+        Assert.True(fs.FileExists("/dir2/file2.txt"));
+    }
+
     [Fact]
     public void TestFile()
     {

src/Zio.Tests/TestData/Linux.zip src/Zio.Tests/TestData/OsZips/Linux.zipsrc/Zio.Tests/TestData/Linux.zip renamed to src/Zio.Tests/TestData/OsZips/Linux.zip

@@ -0,0 +1,3 @@
+These ZIP files contains the following structure:
+    Folder/
+        File.txt [Content: Test]

src/Zio.Tests/TestData/OsZips/README.txt

@@ -0,0 +1,7 @@
+These ZIP files contain a single file.
+
+In WithRootSlash, the file is contained in the root folder (/Test.txt).
+    This was the behavior in Zio 0.21.
+
+In WithoutRootSlash, the file is contained directly in the ZIP file (Test.txt).
+    This is the current behavior.

src/Zio.Tests/TestData/Windows.zip src/Zio.Tests/TestData/OsZips/Windows.zipsrc/Zio.Tests/TestData/Windows.zip renamed to src/Zio.Tests/TestData/OsZips/Windows.zip

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>10</LangVersion>
   </PropertyGroup>