Merge pull request #3 from Erik-White/fix-wim-filesystem

Fix WIM filesystem
LTRData · Jan 24, 2024 · ba5b825 · ba5b825
2 parents 5ec9361 + 15ccf94
commit ba5b825
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,7 +11,7 @@
     <Company>LTR Data</Company>
     <Authors>Kenneth Bell;LordMike;Olof Lagerkvist</Authors>
     <OutputPath>..\$(Configuration)</OutputPath>
-    <FileVersion>1.0.34</FileVersion>
+    <FileVersion>1.0.35</FileVersion>
 
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 

diff --git a/Library/DiscUtils.Streams/DiscUtils.Streams.csproj b/Library/DiscUtils.Streams/DiscUtils.Streams.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="System.Memory" Version="*" />
     <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageReference Include="LTRData.Extensions" Version="*" />
+    <PackageReference Include="LTRData.Extensions" Version="1.0.10" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net461`))' &gt;= 0">

diff --git a/Tests/LibraryTests/LibraryTests.csproj b/Tests/LibraryTests/LibraryTests.csproj
@@ -41,6 +41,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Swap\Data\" />
+    <Folder Include="Wim\Data\" />
   </ItemGroup>
   <ItemGroup>
     <None Update="plist.xml">

diff --git a/Tests/LibraryTests/Wim/Data/TestData.wim b/Tests/LibraryTests/Wim/Data/TestData.wim
diff --git a/Tests/LibraryTests/Wim/WimFileSystemTest.cs b/Tests/LibraryTests/Wim/WimFileSystemTest.cs
@@ -0,0 +1,62 @@
+using System.IO;
+using System.Linq;
+using Xunit;
+using DiscUtils.Wim;
+
+namespace LibraryTests.Wim;
+
+public class WinFileSystemTest
+{
+    private static string testDataPath = Path.Combine("..", "..", "LibraryTests", "Wim", "Data", "TestData.wim");
+
+    [Fact]
+    public void ReadRootDirectoryFiles()
+    {
+        using var fileStream = File.OpenRead(testDataPath);
+        var wimFile = new WimFile(fileStream);
+        var image = wimFile.GetImage(0);
+
+        var files = image.GetFiles(image.Root.FullName, "*.*", SearchOption.AllDirectories).ToList();
+
+        Assert.Equal(3, files.Count);
+    }
+
+    [Fact]
+    public void ReadSubDirectoryFiles()
+    {
+        using var fileStream = File.OpenRead(testDataPath);
+        var wimFile = new WimFile(fileStream);
+        var image = wimFile.GetImage(0);
+
+        var files = image.GetFiles("\\TestData", "*.*", SearchOption.AllDirectories).ToList();
+
+        Assert.Equal(3, files.Count);
+    }
+
+    [Fact]
+    public void ReadFilteredDirectory()
+    {
+        const string ExpectedDirectoryPath = "\\TestData\\Foo";
+
+        using var fileStream = File.OpenRead(testDataPath);
+        var wimFile = new WimFile(fileStream);
+        var image = wimFile.GetImage(0);
+
+        var directories = image.GetDirectories(image.Root.FullName, "Foo.*", SearchOption.AllDirectories).ToList();
+
+        Assert.Single(directories);
+        Assert.Equal(ExpectedDirectoryPath, directories[0]);
+    }
+
+    [Fact]
+    public void ReadFilteredFile()
+    {
+        using var fileStream = File.OpenRead(testDataPath);
+        var wimFile = new WimFile(fileStream);
+        var image = wimFile.GetImage(0);
+
+        var files = image.GetFiles("\\TestData\\Foo", "Lorem.*", SearchOption.AllDirectories).ToList();
+
+        Assert.Equal(2, files.Count);
+    }
+}