Handle some NONE cases better

This commit is contained in:
Matt Nadareski
2026-07-24 19:40:49 -04:00
parent a16d369e7b
commit dcaeba49f9
3 changed files with 6 additions and 4 deletions

View File

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

View File

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

View File

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