Merge branch 'release/0.7.1' into main

cake-contrib · Oct 7, 2020 · c0acd1b · c0acd1b
2 parents 6acc421 + bfb1977
commit c0acd1b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 1 deletion.
diff --git a/demo/build.cake b/demo/build.cake
@@ -167,6 +167,18 @@ Task("RenameFile")
         .WithRenameFile(File("CODE_OF_CONDUCT.md"), File("CODE_OF_CONDUCT.txt")));
 });
 
+Task("GH78")
+   .IsDependentOn("Clean")
+   .IsDependentOn("ZipVolumes")
+   .Does(() =>
+{
+    SevenZip(m => m
+    .InExtractMode()
+    .WithArchive(output + File("volume.7z.001"))
+    .WithArchiveType(SwitchArchiveType.SevenZip.Volumes())
+    .WithOutputDirectory(output + Directory("Test01")));
+});
+
 Task("Default")
    .IsDependentOn("Clean")
    .IsDependentOn("ZipIt")
@@ -179,6 +191,7 @@ Task("Default")
    .IsDependentOn("GetHash")
    .IsDependentOn("DoBenchmark")
    .IsDependentOn("ListArchiveContent")
-   .IsDependentOn("RenameFile");
+   .IsDependentOn("RenameFile")
+   .IsDependentOn("GH78");
 
 RunTarget(target);
diff --git a/src/Cake.7zip.Tests/Settings/Switches/SwitchArchiveTypeTests.cs b/src/Cake.7zip.Tests/Settings/Switches/SwitchArchiveTypeTests.cs
@@ -24,6 +24,18 @@ public void ArchiveType_StaticProps_works(SwitchArchiveType type, string expecte
             actual.Should().Be(expected);
         }
 
+        [Theory]
+        [ClassData(typeof(TestData))]
+        public void ArchiveType_StaticPropsSplit_works(SwitchArchiveType type, string expectedType)
+        {
+            var fixture = new SevenZipSettingsFixture();
+            var expected = "-t" + expectedType + ".split";
+
+            var actual = fixture.Parse(b => type.Volumes().BuildArguments(ref b));
+
+            actual.Should().Be(expected);
+        }
+
         private class TestData : IEnumerable<object[]>
         {
             public IEnumerator<object[]> GetEnumerator()

diff --git a/src/Cake.7zip/Builder/ExtractCommandBuilder.cs b/src/Cake.7zip/Builder/ExtractCommandBuilder.cs
@@ -20,6 +20,16 @@ namespace Cake.SevenZip.Builder
     ///       .WithArchiveType(SwitchArchiveType.Zip)
     ///       .WithOutputDirectory("some/other/directory"));
     /// });
+    ///
+    /// Task("UnzipVolumes")
+    ///     .Does(() =>
+    /// {
+    ///     SevenZip(m => m
+    ///       .InExtractMode()
+    ///       .WithArchive(File("path/to/file.7z.001"))
+    ///       .WithArchiveType(SwitchArchiveType.SevenZip.Volumes())
+    ///       .WithOutputDirectory("some/other/directory"));
+    /// });
     /// ]]>
     /// </code>
     /// </example>

diff --git a/src/Cake.7zip/Switches/SwitchArchiveType.cs b/src/Cake.7zip/Switches/SwitchArchiveType.cs
@@ -74,6 +74,16 @@ private SwitchArchiveType(string type)
         /// </summary>
         public static SwitchArchiveType Bzip2 { get; } = new SwitchArchiveType("bzip2");
 
+        /// <summary>
+        /// Append ".split" to the type.
+        /// This is needed when extracting/testing multi-volume archives.
+        /// </summary>
+        /// <returns>A <see cref="SwitchArchiveType"/> with <c>.split</c> appended.</returns>
+        public SwitchArchiveType Volumes()
+        {
+            return new SwitchArchiveType(type + ".split");
+        }
+
         /// <inheritdoc />
         public void BuildArguments(ref ProcessArgumentBuilder builder)
         {