ZStandard support added to zip/zipx (WinZip) and 7zip (mcmilk 7zip)

caesay · Feb 2, 2023 · 92df1ec · 92df1ec
1 parent b9d0195
commit 92df1ec
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 39 deletions.
diff --git a/src/SharpCompress/Common/Zip/ZipCompressionMethod.cs b/src/SharpCompress/Common/Zip/ZipCompressionMethod.cs
@@ -7,6 +7,7 @@ internal enum ZipCompressionMethod
     Deflate64 = 9,
     BZip2 = 12,
     LZMA = 14,
+    ZStd = 93,
     Xz = 95,
     PPMd = 98,
     WinzipAes = 0x63 //http://www.winzip.com/aes_info.htm

diff --git a/src/SharpCompress/Common/Zip/ZipFilePart.cs b/src/SharpCompress/Common/Zip/ZipFilePart.cs
@@ -11,6 +11,7 @@
 using SharpCompress.Compressors.PPMd;
 using SharpCompress.Compressors.Xz;
 using SharpCompress.IO;
+using ZstdSharp;
 
 namespace SharpCompress.Common.Zip;
 
@@ -102,6 +103,10 @@ protected Stream CreateDecompressionStream(Stream stream, ZipCompressionMethod m
             {
                 return new XZStream(stream);
             }
+            case ZipCompressionMethod.ZStd:
+            {
+                return new DecompressionStream(stream);
+            }
             case ZipCompressionMethod.PPMd:
             {
                 Span<byte> props = stackalloc byte[2];

diff --git a/src/SharpCompress/Compressors/LZMA/Registry.cs b/src/SharpCompress/Compressors/LZMA/Registry.cs
@@ -7,6 +7,7 @@
 using SharpCompress.Compressors.Filters;
 using SharpCompress.Compressors.LZMA.Utilites;
 using SharpCompress.Compressors.PPMd;
+using ZstdSharp;
 
 namespace SharpCompress.Compressors.LZMA;
 
@@ -20,6 +21,7 @@ internal static class DecoderRegistry
     private const uint K_BCJ2 = 0x0303011B;
     private const uint K_DEFLATE = 0x040108;
     private const uint K_B_ZIP2 = 0x040202;
+    private const uint K_ZSTD = 0x4F71101;
 
     internal static Stream CreateDecoderStream(
         CMethodId id,
@@ -52,6 +54,8 @@ long limit
                 return new PpmdStream(new PpmdProperties(info), inStreams.Single(), false);
             case K_DEFLATE:
                 return new DeflateStream(inStreams.Single(), CompressionMode.Decompress);
+            case K_ZSTD:
+                return new DecompressionStream(inStreams.Single());
             default:
                 throw new NotSupportedException();
         }

diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj
@@ -1,41 +1,44 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyTitle>SharpCompress - Pure C# Decompression/Compression</AssemblyTitle>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>0.33.0</VersionPrefix>
-    <AssemblyVersion>0.33.0</AssemblyVersion>
-    <FileVersion>0.33.0</FileVersion>
-    <Authors>Adam Hathcock</Authors>
-    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
-    <AssemblyName>SharpCompress</AssemblyName>
-    <AssemblyOriginatorKeyFile>../../SharpCompress.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PackageId>SharpCompress</PackageId>
-    <PackageTags>rar;unrar;zip;unzip;bzip2;gzip;tar;7zip;lzip;xz</PackageTags>
-    <PackageProjectUrl>https://github.com/adamhathcock/sharpcompress</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Copyright>Copyright (c) 2014  Adam Hathcock</Copyright>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Description>SharpCompress is a compression library for NET Standard 2.0/2.1/NET 6.0/NET 7.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</Description>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <IsTrimmable>true</IsTrimmable>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<AssemblyTitle>SharpCompress - Pure C# Decompression/Compression</AssemblyTitle>
+		<NeutralLanguage>en-US</NeutralLanguage>
+		<VersionPrefix>0.33.0</VersionPrefix>
+		<AssemblyVersion>0.33.0</AssemblyVersion>
+		<FileVersion>0.33.0</FileVersion>
+		<Authors>Adam Hathcock</Authors>
+		<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+		<AssemblyName>SharpCompress</AssemblyName>
+		<AssemblyOriginatorKeyFile>../../SharpCompress.snk</AssemblyOriginatorKeyFile>
+		<SignAssembly>False</SignAssembly>
+		<PackageId>SharpCompress</PackageId>
+		<PackageTags>rar;unrar;zip;unzip;bzip2;gzip;tar;7zip;lzip;xz</PackageTags>
+		<PackageProjectUrl>https://github.com/adamhathcock/sharpcompress</PackageProjectUrl>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<Copyright>Copyright (c) 2014  Adam Hathcock</Copyright>
+		<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+		<Description>SharpCompress is a compression library for NET Standard 2.0/2.1/NET 6.0/NET 7.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented.</Description>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<IsTrimmable>true</IsTrimmable>
+		<LangVersion>latest</LangVersion>
+		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(VersionlessImplicitFrameworkDefine)' == 'NETFRAMEWORK' ">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+		<PackageReference Include="ZstdSharp.Port" Version="0.6.1" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Include="System.Memory" Version="4.5.5" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(VersionlessImplicitFrameworkDefine)' == 'NETFRAMEWORK' ">
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+		<PackageReference Include="System.Memory" Version="4.5.5" />
+	</ItemGroup>
 </Project>
diff --git a/tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs b/tests/SharpCompress.Test/SevenZip/SevenZipArchiveTests.cs
@@ -109,4 +109,27 @@ public void SevenZipArchive_BZip2_Split_FirstFileRead() =>
     //"7Zip.BZip2.split.005",
     //"7Zip.BZip2.split.006",
     //"7Zip.BZip2.split.007"
+
+    [Fact]
+    public void SevenZipArchive_ZSTD_StreamRead() => ArchiveStreamRead("7Zip.ZSTD.7z");
+
+    [Fact]
+    public void SevenZipArchive_ZSTD_PathRead() => ArchiveFileRead("7Zip.ZSTD.7z");
+
+    [Fact]
+    public void SevenZipArchive_ZSTD_Split() =>
+        Assert.Throws<InvalidOperationException>(
+            () =>
+                ArchiveStreamRead(
+                    null,
+                    "7Zip.ZSTD.Split.7z.001",
+                    "7Zip.ZSTD.Split.7z.002",
+                    "7Zip.ZSTD.Split.7z.003",
+                    "7Zip.ZSTD.Split.7z.004",
+                    "7Zip.ZSTD.Split.7z.005",
+                    "7Zip.ZSTD.Split.7z.006"
+                )
+        );
+
+
 }
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.7z b/tests/TestArchives/Archives/7Zip.ZSTD.7z
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.001 b/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.001
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.002 b/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.002
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.003 b/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.003
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.004 b/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.004
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.005 b/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.005
diff --git a/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.006 b/tests/TestArchives/Archives/7Zip.ZSTD.Split.7z.006
diff --git a/tests/TestArchives/Archives/WinZip27_ZSTD.zipx b/tests/TestArchives/Archives/WinZip27_ZSTD.zipx