Skip to content

Commit 8cc0ff3

Browse files
committed
Reenable Zstd PKZIP outputs
1 parent cac6bcc commit 8cc0ff3

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

CHANGELIST.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
- Update Redumper to build 665
8080
- Disable Zstd PKZIP outputs
8181
- Add commented fix for Zstd PKZIP
82+
- Reenable Zstd PKZIP outputs
8283

8384
### 3.5.0 (2025-10-10)
8485

MPF.Frontend.Test/EnumExtensionsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void LongName_InternalProgram(InternalProgram? prog, string? expected)
6767
[InlineData(null, "Unknown")]
6868
[InlineData(LogCompression.DeflateDefault, "ZIP using Deflate (Level 5)")]
6969
[InlineData(LogCompression.DeflateMaximum, "ZIP using Deflate (Level 9)")]
70-
// [InlineData(LogCompression.Zstd19, "ZIP using Zstd (Level 19)")]
70+
[InlineData(LogCompression.Zstd19, "ZIP using Zstd (Level 19)")]
7171
public void LongName_LogCompression(LogCompression? comp, string? expected)
7272
{
7373
string? actual = comp.LongName();

MPF.Frontend/EnumExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static string LongName(this LogCompression? comp)
155155
{
156156
LogCompression.DeflateDefault => "ZIP using Deflate (Level 5)",
157157
LogCompression.DeflateMaximum => "ZIP using Deflate (Level 9)",
158-
// LogCompression.Zstd19 => "ZIP using Zstd (Level 19)",
158+
LogCompression.Zstd19 => "ZIP using Zstd (Level 19)",
159159

160160
_ => "Unknown",
161161
};
@@ -402,8 +402,8 @@ public static LogCompression ToLogCompression(this string? logCompression)
402402
"deflatemaximum"
403403
or "max"
404404
or "maximum" => LogCompression.DeflateMaximum,
405-
// "zstd"
406-
// or "zstd19" => LogCompression.Zstd19,
405+
"zstd"
406+
or "zstd19" => LogCompression.Zstd19,
407407

408408
_ => LogCompression.DeflateDefault,
409409
};

MPF.Processors/BaseProcessor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ public bool CompressLogFiles(MediaType? mediaType,
140140
case LogCompression.DeflateMaximum:
141141
zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.Deflate, CompressionLevel.BestCompression) { UseZip64 = true });
142142
break;
143-
// case LogCompression.Zstd19:
144-
// zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.ZStandard, (CompressionLevel)19) { UseZip64 = true, CompressionBufferSize = 0x20000 });
145-
// break;
143+
case LogCompression.Zstd19:
144+
zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.ZStandard, (CompressionLevel)19) { UseZip64 = true, CompressionBufferSize = 0x20000 });
145+
break;
146146
case LogCompression.DeflateDefault:
147147
default:
148148
zf.SaveTo(archiveName, new ZipWriterOptions(CompressionType.Deflate, CompressionLevel.Default) { UseZip64 = true });

MPF.Processors/Enumerations.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public enum LogCompression
1818
/// <summary>
1919
/// PKZIP using Zstd level 19
2020
/// </summary>
21-
/// TODO: Re-enable when fixed at the library level
22-
// Zstd19,
21+
Zstd19,
2322
}
2423

2524
/// <summary>

0 commit comments

Comments
 (0)