From dcaeba49f9ad4d13f1cb31db985e8c8be8cabcda Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 24 Jul 2026 19:40:49 -0400
Subject: [PATCH] Handle some NONE cases better

---
 SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs | 2 ++
 SabreTools.RedumpLib/Data/Extensions.cs           | 4 ++--
 SabreTools.RedumpLib/Tools/Formatter.cs           | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
index 2a0e4fb..2e692a1 100644
--- a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
+++ b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
@@ -375,6 +375,7 @@ namespace SabreTools.RedumpLib.Test.Data
         /// </summary>
         private static readonly MediaType?[] _mappableMediaTypes =
         [
+            MediaType.NONE,
             MediaType.BD25,
             MediaType.BD33,
             MediaType.BD50,
@@ -400,6 +401,7 @@ namespace SabreTools.RedumpLib.Test.Data
         /// </summary>
         private static readonly PhysicalMediaType?[] _mappablePhysicalMediaTypes =
         [
+            PhysicalMediaType.NONE,
             PhysicalMediaType.BluRay,
             PhysicalMediaType.CDROM,
             PhysicalMediaType.DVD,
diff --git a/SabreTools.RedumpLib/Data/Extensions.cs b/SabreTools.RedumpLib/Data/Extensions.cs
index 94125ec..3182e1c 100644
--- a/SabreTools.RedumpLib/Data/Extensions.cs
+++ b/SabreTools.RedumpLib/Data/Extensions.cs
@@ -144,6 +144,7 @@ namespace SabreTools.RedumpLib.Data
         {
             return mediaType switch
             {
+                PhysicalMediaType.NONE => MediaType.NONE,
                 PhysicalMediaType.BluRay => MediaType.BD50,
                 PhysicalMediaType.CDROM => MediaType.CD,
                 PhysicalMediaType.DVD => MediaType.DVD9,
@@ -156,7 +157,6 @@ namespace SabreTools.RedumpLib.Data
                 PhysicalMediaType.UMD => MediaType.UMDDL,
 
                 // Invalid cases for conversion
-                PhysicalMediaType.NONE => null,
                 PhysicalMediaType.ApertureCard => null,
                 PhysicalMediaType.JacquardLoomCard => null,
                 PhysicalMediaType.MagneticStripeCard => null,
@@ -195,6 +195,7 @@ namespace SabreTools.RedumpLib.Data
         {
             return discType switch
             {
+                MediaType.NONE => PhysicalMediaType.NONE,
                 MediaType.BD25
                     or MediaType.BD33
                     or MediaType.BD50
@@ -216,7 +217,6 @@ namespace SabreTools.RedumpLib.Data
                     or MediaType.UMDDL => PhysicalMediaType.UMD,
 
                 // Invalid cases for conversion
-                MediaType.NONE => null,
                 MediaType.MILCD => null,
                 null => null,
                 _ => null,
diff --git a/SabreTools.RedumpLib/Tools/Formatter.cs b/SabreTools.RedumpLib/Tools/Formatter.cs
index 65c844c..4e595bc 100644
--- a/SabreTools.RedumpLib/Tools/Formatter.cs
+++ b/SabreTools.RedumpLib/Tools/Formatter.cs
@@ -326,8 +326,8 @@ namespace SabreTools.RedumpLib.Tools
         {
             output.AppendLine("Ring Codes:");
 
-            // If we have a quad-layer disc
-            if (discIdentifiers.Layerbreak3 != default)
+            // If we have a quad-layer disc or a generic media type case
+            if (discIdentifiers.Layerbreak3 != default || mediaType == PhysicalMediaType.NONE)
             {
                 AddIfExists(output, $"Layer 0 {Template.MasteringCodeField}", section.Layer0MasteringCode, 1);
                 AddIfExists(output, $"Layer 0 {Template.MasteringSIDField}", section.Layer0MasteringSID, 1);