Reenable Zstd PKZIP outputs

This commit is contained in:
Matt Nadareski
2025-11-27 20:09:43 -05:00
parent cac6bcc4de
commit 8cc0ff3829
5 changed files with 9 additions and 9 deletions

View File

@@ -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)

View File

@@ -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();

View File

@@ -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,
};

View File

@@ -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 });

View File

@@ -18,8 +18,7 @@ namespace MPF.Processors
/// <summary>
/// PKZIP using Zstd level 19
/// </summary>
/// TODO: Re-enable when fixed at the library level
// Zstd19,
Zstd19,
}
/// <summary>