From 7b116e7a044eee564a96bcdf5ecca7acc9569a2a Mon Sep 17 00:00:00 2001
From: TurnedToast <149647574+TurnedToast@users.noreply.github.com>
Date: Fri, 6 Sep 2024 22:52:20 -0400
Subject: [PATCH] =?UTF-8?q?Ensure=20manufacturer=20files=20starting=20from?=
 =?UTF-8?q?=200=20are=20zipped=20in=20redumper=20DVD=20=E2=80=A6=20(#747)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Ensure manufacturer files starting from 0 are zipped in redumper DVD processing

* Remove extraneous DVD manufacturer/physical, add needed physical for bluray
---
 MPF.Processors/Redumper.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/MPF.Processors/Redumper.cs b/MPF.Processors/Redumper.cs
index b8ae832c..89c959a7 100644
--- a/MPF.Processors/Redumper.cs
+++ b/MPF.Processors/Redumper.cs
@@ -452,13 +452,13 @@ namespace MPF.Processors
                             "log"),
                         new CustomOutputFile($"{baseFilename}.log", OutputFileFlags.Required,
                             DatfileExists),
-                        new([$"{baseFilename}.manufacturer", $"{baseFilename}.1.manufacturer"], OutputFileFlags.Required
+                        new([$"{baseFilename}.manufacturer", $"{baseFilename}.0.manufacturer"], OutputFileFlags.Required
                             | OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
-                            "manufacturer_1"),
-                        new($"{baseFilename}.2.manufacturer", OutputFileFlags.Binary
+                            "manufacturer_0"),
+                        new($"{baseFilename}.1.manufacturer", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
-                            "manufacturer_2"),
+                            "manufacturer_1"),
                         new([$"{baseFilename}.physical", $"{baseFilename}.0.physical"], OutputFileFlags.Required
                             | OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
@@ -466,9 +466,6 @@ namespace MPF.Processors
                         new($"{baseFilename}.1.physical", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "physical_1"),
-                        new($"{baseFilename}.2.physical", OutputFileFlags.Binary
-                            | OutputFileFlags.Zippable,
-                            "physical_2"),
                         new($"{baseFilename}.security", System.IsXGD()
                             ? OutputFileFlags.Required | OutputFileFlags.Binary | OutputFileFlags.Zippable
                             : OutputFileFlags.Binary | OutputFileFlags.Zippable,
@@ -516,6 +513,9 @@ namespace MPF.Processors
                         new($"{baseFilename}.2.physical", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "physical_2"),
+                        new($"{baseFilename}.3.physical", OutputFileFlags.Binary
+                            | OutputFileFlags.Zippable,
+                            "physical_3"),
                         new($"{baseFilename}.skeleton", OutputFileFlags.Binary
                             | OutputFileFlags.Zippable,
                             "skeleton"),