From ab3abb5b3e290f3fe045fb8f27dff0f9bdb0db67 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 10 Apr 2023 08:57:51 -0400
Subject: [PATCH] Re-enable BD33 and BD66

---
 CHANGELIST.md                                    |  1 +
 MPF.Library/InfoTool.cs                          | 12 ++++++------
 MPF.Test/RedumpLib/ExtensionsTests.cs            |  4 ++--
 .../ViewModels/DiscInformationViewModel.cs       |  4 ++--
 RedumpLib/Data/Enumerations.cs                   |  8 ++++----
 RedumpLib/Data/Extensions.cs                     | 16 ++++++++--------
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 040133b6..1d7c1346 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -17,6 +17,7 @@
 - Update redumper to build 118
 - Clarify non-Redump systems
 - Add UltraCade
+- Re-enable BD33 and BD66
 
 ### 2.5 (2023-03-12)
 
diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs
index 2b1ea7c2..1d38ff98 100644
--- a/MPF.Library/InfoTool.cs
+++ b/MPF.Library/InfoTool.cs
@@ -1604,21 +1604,21 @@ namespace MPF.Library
             switch (info.CommonDiscInfo.Media)
             {
                 case DiscType.BD25:
-                //case DiscType.BD33:
+                case DiscType.BD33:
                 case DiscType.BD50:
-                //case DiscType.BD66:
+                case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                     if (info.SizeAndChecksums.Layerbreak3 != default)
                         info.CommonDiscInfo.Media = DiscType.BD128;
                     else if (info.SizeAndChecksums.Layerbreak2 != default)
                         info.CommonDiscInfo.Media = DiscType.BD100;
-                    //else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 53_687_063_712)
-                    //    info.CommonDiscInfo.Media = DiscType.BD66;
+                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 50_050_629_632)
+                        info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default)
                         info.CommonDiscInfo.Media = DiscType.BD50;
-                    //else if (info.SizeAndChecksums.Size > 26_843_531_856)
-                    //    info.CommonDiscInfo.Media = DiscType.BD33;
+                    else if (info.SizeAndChecksums.Size > 25_025_314_816)
+                        info.CommonDiscInfo.Media = DiscType.BD33;
                     else
                         info.CommonDiscInfo.Media = DiscType.BD25;
                     break;
diff --git a/MPF.Test/RedumpLib/ExtensionsTests.cs b/MPF.Test/RedumpLib/ExtensionsTests.cs
index 826aca68..fcc2cb83 100644
--- a/MPF.Test/RedumpLib/ExtensionsTests.cs
+++ b/MPF.Test/RedumpLib/ExtensionsTests.cs
@@ -18,9 +18,9 @@ namespace MPF.Test.RedumpLib
         private static readonly DiscType?[] _mappableDiscTypes = new DiscType?[]
         {
             DiscType.BD25,
-            //DiscType.BD33,
+            DiscType.BD33,
             DiscType.BD50,
-            //DiscType.BD66,
+            DiscType.BD66,
             DiscType.BD100,
             DiscType.BD128,
             DiscType.CD,
diff --git a/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs b/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
index 6ff7eb0a..646c7e6b 100644
--- a/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
+++ b/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs
@@ -671,9 +671,9 @@ namespace MPF.UI.Core.ViewModels
                 case DiscType.HDDVDSL:
                 case DiscType.HDDVDDL:
                 case DiscType.BD25:
-                //case DiscType.BD33:
+                case DiscType.BD33:
                 case DiscType.BD50:
-                //case DiscType.BD66:
+                case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                 case DiscType.NintendoGameCubeGameDisc:
diff --git a/RedumpLib/Data/Enumerations.cs b/RedumpLib/Data/Enumerations.cs
index 51c440ca..da245812 100644
--- a/RedumpLib/Data/Enumerations.cs
+++ b/RedumpLib/Data/Enumerations.cs
@@ -56,14 +56,14 @@ namespace RedumpLib.Data
         [HumanReadable(LongName = "BD-25")]
         BD25,
 
-        //[HumanReadable(LongName = "BD-33")]
-        //BD33,
+        [HumanReadable(LongName = "BD-33")]
+        BD33,
 
         [HumanReadable(LongName = "BD-50")]
         BD50,
 
-        //[HumanReadable(LongName = "BD-66")]
-        //BD66,
+        [HumanReadable(LongName = "BD-66")]
+        BD66,
 
         [HumanReadable(LongName = "BD-100")]
         BD100,
diff --git a/RedumpLib/Data/Extensions.cs b/RedumpLib/Data/Extensions.cs
index 93e48e5a..3606373e 100644
--- a/RedumpLib/Data/Extensions.cs
+++ b/RedumpLib/Data/Extensions.cs
@@ -770,9 +770,9 @@ namespace RedumpLib.Data
             switch (discType)
             {
                 case DiscType.BD25:
-                //case DiscType.BD33:
+                case DiscType.BD33:
                 case DiscType.BD50:
-                //case DiscType.BD66:
+                case DiscType.BD66:
                 case DiscType.BD100:
                 case DiscType.BD128:
                     return MediaType.BluRay;
@@ -875,15 +875,15 @@ namespace RedumpLib.Data
                 case "bd25":
                 case "bd-25":
                     return DiscType.BD25;
-                //case "bd33":
-                //case "bd-33":
-                //    return DiscType.BD33;
+                case "bd33":
+                case "bd-33":
+                    return DiscType.BD33;
                 case "bd50":
                 case "bd-50":
                     return DiscType.BD50;
-                //case "bd66":
-                //case "bd-66":
-                //    return DiscType.BD66;
+                case "bd66":
+                case "bd-66":
+                    return DiscType.BD66;
                 case "bd100":
                 case "bd-100":
                     return DiscType.BD100;