From 8cc0ff38298ca686de47f09271655030122d4265 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 27 Nov 2025 20:09:43 -0500 Subject: [PATCH] Reenable Zstd PKZIP outputs --- CHANGELIST.md | 1 + MPF.Frontend.Test/EnumExtensionsTests.cs | 2 +- MPF.Frontend/EnumExtensions.cs | 6 +++--- MPF.Processors/BaseProcessor.cs | 6 +++--- MPF.Processors/Enumerations.cs | 3 +-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index a721a447..3706f90e 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -79,6 +79,7 @@ - Update Redumper to build 665 - Disable Zstd PKZIP outputs - Add commented fix for Zstd PKZIP +- Reenable Zstd PKZIP outputs ### 3.5.0 (2025-10-10) diff --git a/MPF.Frontend.Test/EnumExtensionsTests.cs b/MPF.Frontend.Test/EnumExtensionsTests.cs index 56b7f43b..8048e9fa 100644 --- a/MPF.Frontend.Test/EnumExtensionsTests.cs +++ b/MPF.Frontend.Test/EnumExtensionsTests.cs @@ -67,7 +67,7 @@ namespace MPF.Frontend.Test [InlineData(null, "Unknown")] [InlineData(LogCompression.DeflateDefault, "ZIP using Deflate (Level 5)")] [InlineData(LogCompression.DeflateMaximum, "ZIP using Deflate (Level 9)")] - // [InlineData(LogCompression.Zstd19, "ZIP using Zstd (Level 19)")] + [InlineData(LogCompression.Zstd19, "ZIP using Zstd (Level 19)")] public void LongName_LogCompression(LogCompression? comp, string? expected) { string? actual = comp.LongName(); diff --git a/MPF.Frontend/EnumExtensions.cs b/MPF.Frontend/EnumExtensions.cs index c064b93d..9e08ea2f 100644 --- a/MPF.Frontend/EnumExtensions.cs +++ b/MPF.Frontend/EnumExtensions.cs @@ -155,7 +155,7 @@ namespace MPF.Frontend { LogCompression.DeflateDefault => "ZIP using Deflate (Level 5)", LogCompression.DeflateMaximum => "ZIP using Deflate (Level 9)", - // LogCompression.Zstd19 => "ZIP using Zstd (Level 19)", + LogCompression.Zstd19 => "ZIP using Zstd (Level 19)", _ => "Unknown", }; @@ -402,8 +402,8 @@ namespace MPF.Frontend "deflatemaximum" or "max" or "maximum" => LogCompression.DeflateMaximum, - // "zstd" - // or "zstd19" => LogCompression.Zstd19, + "zstd" + or "zstd19" => LogCompression.Zstd19, _ => LogCompression.DeflateDefault, }; diff --git a/MPF.Processors/BaseProcessor.cs b/MPF.Processors/BaseProcessor.cs index cb9e3e9a..eb044ab8 100644 --- a/MPF.Processors/BaseProcessor.cs +++ b/MPF.Processors/BaseProcessor.cs @@ -140,9 +140,9 @@ namespace MPF.Processors case LogCompression.DeflateMaximum: zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.Deflate, CompressionLevel.BestCompression) { UseZip64 = true }); break; - // case LogCompression.Zstd19: - // zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.ZStandard, (CompressionLevel)19) { UseZip64 = true, CompressionBufferSize = 0x20000 }); - // break; + case LogCompression.Zstd19: + zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.ZStandard, (CompressionLevel)19) { UseZip64 = true, CompressionBufferSize = 0x20000 }); + break; case LogCompression.DeflateDefault: default: zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.Deflate, CompressionLevel.Default) { UseZip64 = true }); diff --git a/MPF.Processors/Enumerations.cs b/MPF.Processors/Enumerations.cs index 5c50fb82..0c1a18f1 100644 --- a/MPF.Processors/Enumerations.cs +++ b/MPF.Processors/Enumerations.cs @@ -18,8 +18,7 @@ namespace MPF.Processors /// /// PKZIP using Zstd level 19 /// - /// TODO: Re-enable when fixed at the library level - // Zstd19, + Zstd19, } ///