fixed wlb unpacking, added tests, updated to 1.1.1

fgsfds · Nov 27, 2024 · 291ff25 · 291ff25
1 parent ddefc47
commit 291ff25
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/src/Addons/Providers/InstalledAddonsProvider.cs b/src/Addons/Providers/InstalledAddonsProvider.cs
@@ -973,8 +973,7 @@ or GameEnum.NAM
                 //need to unpack addons that contain custom RFF files
                 unpackedTo = Unpack(pathToFile, archive);
             }
-
-            if (addonDto.Executables is not null)
+            else if (addonDto.Executables is not null)
             {
                 //need to unpack addons with custom executables
                 unpackedTo = Unpack(pathToFile, archive);

diff --git a/src/Tests/AddonFilesTests.cs b/src/Tests/AddonFilesTests.cs
@@ -17,8 +17,11 @@ public sealed class AddonFilesTests : IDisposable
     public AddonFilesTests()
     {
         var game = new Mock<IGame>();
+        _ = game.Setup(x => x.GameEnum).Returns(Common.Enums.GameEnum.Blood);
+
         var config = new Mock<IConfigProvider>();
         _ = config.Setup(x => x.DisabledAutoloadMods).Returns([]);
+
         var logger = new Mock<ILogger>();
 
         _installedAddonsProvider = new(game.Object, config.Object, logger.Object);
@@ -120,4 +123,26 @@ public async Task GrpInfoTest()
         Assert.True(Directory.Exists(pathToFile.Replace(".zip", "")));
         Assert.True(File.Exists(Path.Combine(pathToFile.Replace(".zip", ""), "addons.grpinfo")));
     }
+
+    [Fact]
+    public async Task WhatLiesBeneathTest()
+    {
+        _ = Directory.CreateDirectory("FilesTemp");
+        File.Copy(Path.Combine("Files", "WhatLiesBeneathAddon.zip"), Path.Combine("FilesTemp", "WhatLiesBeneathAddon.zip"));
+
+        var pathToFile = Path.Combine(Directory.GetCurrentDirectory(), "FilesTemp", "WhatLiesBeneathAddon.zip");
+
+        var result = await (Task<Dictionary<AddonVersion, IAddon>>)_getAddonsFromFilesAsync.Invoke(_installedAddonsProvider, [(object)new List<string>() { pathToFile }])!;
+
+        _ = Assert.Single(result);
+
+        var a = result.First();
+
+        Assert.Equal("blood-what-lies-beneath", a.Key.Id);
+        Assert.Equal("1.1.7", a.Key.Version);
+        Assert.Equal("What Lies Beneath", a.Value.Title);
+
+        Assert.False(File.Exists(pathToFile));
+        Assert.True(Directory.Exists(pathToFile.Replace(".zip", "")));
+    }
 }
diff --git a/src/Tests/Files/WhatLiesBeneathAddon.zip b/src/Tests/Files/WhatLiesBeneathAddon.zip
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -10,6 +10,7 @@
     <None Remove="Files\GrpInfoAddon.zip" />
     <None Remove="Files\TEST.MAP" />
     <None Remove="Files\UnpackedAddon.zip" />
+    <None Remove="Files\WhatLiesBeneathAddon.zip" />
     <None Remove="Files\ZippedAddon.zip" />
   </ItemGroup>
 
@@ -42,6 +43,9 @@
     <Content Include="Files\UnpackedAddon.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Files\WhatLiesBeneathAddon.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Files\ZippedAddon.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>