From 075a95ef4c9856506b671a4df3f5c323dc4473cb Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 5 Dec 2024 22:45:53 -0500 Subject: [PATCH] Ensure consistency in frontend code --- CHANGELIST.md | 1 + MPF.Frontend/DumpEnvironment.cs | 6 ++++-- MPF.Frontend/Tools/SubmissionGenerator.cs | 1 + MPF.Frontend/ViewModels/MainViewModel.cs | 11 ++++++++--- MPF.Processors/DiscImageCreator.cs | 1 + MPF.Processors/Generic.cs | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index 8d95e3d2..cc082a93 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -50,6 +50,7 @@ - Unify queue handling in processing queue - Add non-tools frontend tests - Update RedumpLib to 1.6.1 +- Ensure consistency in frontend code ### 3.2.4 (2024-11-24) diff --git a/MPF.Frontend/DumpEnvironment.cs b/MPF.Frontend/DumpEnvironment.cs index 24e258ec..93d6559b 100644 --- a/MPF.Frontend/DumpEnvironment.cs +++ b/MPF.Frontend/DumpEnvironment.cs @@ -285,7 +285,8 @@ namespace MPF.Frontend or MediaType.HDDVD or MediaType.BluRay or MediaType.NintendoGameCubeGameDisc - or MediaType.NintendoWiiOpticalDisc => true, + or MediaType.NintendoWiiOpticalDisc + or MediaType.NintendoWiiUOpticalDisc => true, _ => false, }; } @@ -343,7 +344,8 @@ namespace MPF.Frontend // Partially supported types MediaType.GDROM or MediaType.NintendoGameCubeGameDisc - or MediaType.NintendoWiiOpticalDisc => ResultEventArgs.Success($"{_type.LongName()} partially supported for dumping"), + or MediaType.NintendoWiiOpticalDisc + or MediaType.NintendoWiiUOpticalDisc => ResultEventArgs.Success($"{_type.LongName()} partially supported for dumping"), // Special case for other supported tools MediaType.UMD => ResultEventArgs.Failure($"{_type.LongName()} supported for submission info parsing"), diff --git a/MPF.Frontend/Tools/SubmissionGenerator.cs b/MPF.Frontend/Tools/SubmissionGenerator.cs index 209a3146..98487889 100644 --- a/MPF.Frontend/Tools/SubmissionGenerator.cs +++ b/MPF.Frontend/Tools/SubmissionGenerator.cs @@ -558,6 +558,7 @@ namespace MPF.Frontend.Tools break; case MediaType.NintendoWiiOpticalDisc: + case MediaType.NintendoWiiUOpticalDisc: // If we have a single-layer disc if (info.SizeAndChecksums!.Layerbreak == default) diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs index aa83bdee..060bb05a 100644 --- a/MPF.Frontend/ViewModels/MainViewModel.cs +++ b/MPF.Frontend/ViewModels/MainViewModel.cs @@ -1258,7 +1258,7 @@ namespace MPF.Frontend.ViewModels else if (Options.SkipSystemDetection && Options.DefaultSystem != null) { var currentSystem = Options.DefaultSystem; - VerboseLogLn($"System detection disabled, setting to default of {currentSystem.LongName()}."); + VerboseLogLn($"System detection disabled, defaulting to {currentSystem.LongName()}."); int sysIndex = Systems.FindIndex(s => s == currentSystem); CurrentSystem = Systems[sysIndex]; } @@ -1932,7 +1932,7 @@ namespace MPF.Frontend.ViewModels public void SetSupportedDriveSpeed() { // Set the drive speed list that's appropriate - DriveSpeeds = (List)InterfaceConstants.GetSpeedsForMediaType(CurrentMediaType); + DriveSpeeds = InterfaceConstants.GetSpeedsForMediaType(CurrentMediaType); VerboseLogLn($"Supported media speeds: {string.Join(", ", [.. DriveSpeeds.ConvertAll(ds => ds.ToString())])}"); // Set the selected speed @@ -1963,7 +1963,7 @@ namespace MPF.Frontend.ViewModels if (CurrentMediaType == null || CurrentMediaType == MediaType.NONE) return false; - return (CurrentProgram) switch + return CurrentProgram switch { // Aaru InternalProgram.Aaru when CurrentMediaType == MediaType.BluRay => true, @@ -1977,6 +1977,7 @@ namespace MPF.Frontend.ViewModels InternalProgram.Aaru when CurrentMediaType == MediaType.HDDVD => true, InternalProgram.Aaru when CurrentMediaType == MediaType.NintendoGameCubeGameDisc => true, InternalProgram.Aaru when CurrentMediaType == MediaType.NintendoWiiOpticalDisc => true, + InternalProgram.Aaru when CurrentMediaType == MediaType.NintendoWiiUOpticalDisc => true, InternalProgram.Aaru when CurrentMediaType == MediaType.SDCard => true, // DiscImageCreator @@ -1991,6 +1992,7 @@ namespace MPF.Frontend.ViewModels InternalProgram.DiscImageCreator when CurrentMediaType == MediaType.HDDVD => true, InternalProgram.DiscImageCreator when CurrentMediaType == MediaType.NintendoGameCubeGameDisc => true, InternalProgram.DiscImageCreator when CurrentMediaType == MediaType.NintendoWiiOpticalDisc => true, + InternalProgram.DiscImageCreator when CurrentMediaType == MediaType.NintendoWiiUOpticalDisc => true, InternalProgram.DiscImageCreator when CurrentMediaType == MediaType.SDCard => true, // Redumper @@ -1999,6 +2001,9 @@ namespace MPF.Frontend.ViewModels InternalProgram.Redumper when CurrentMediaType == MediaType.DVD => true, InternalProgram.Redumper when CurrentMediaType == MediaType.GDROM => true, InternalProgram.Redumper when CurrentMediaType == MediaType.HDDVD => true, + InternalProgram.Redumper when CurrentMediaType == MediaType.NintendoGameCubeGameDisc => true, + InternalProgram.Redumper when CurrentMediaType == MediaType.NintendoWiiOpticalDisc => true, + InternalProgram.Redumper when CurrentMediaType == MediaType.NintendoWiiUOpticalDisc => true, // Default _ => false, diff --git a/MPF.Processors/DiscImageCreator.cs b/MPF.Processors/DiscImageCreator.cs index 89ebc8c9..04886f0f 100644 --- a/MPF.Processors/DiscImageCreator.cs +++ b/MPF.Processors/DiscImageCreator.cs @@ -702,6 +702,7 @@ namespace MPF.Processors case MediaType.HDDVD: case MediaType.BluRay: + case MediaType.NintendoWiiUOpticalDisc: return [ new($"{baseFilename}.dat", OutputFileFlags.Required | OutputFileFlags.Zippable), diff --git a/MPF.Processors/Generic.cs b/MPF.Processors/Generic.cs index 6ebc0f8f..49dd6ed9 100644 --- a/MPF.Processors/Generic.cs +++ b/MPF.Processors/Generic.cs @@ -44,6 +44,7 @@ namespace MPF.Processors case MediaType.DVD: case MediaType.NintendoGameCubeGameDisc: case MediaType.NintendoWiiOpticalDisc: + case MediaType.NintendoWiiUOpticalDisc: case MediaType.HDDVD: case MediaType.BluRay: case MediaType.UMD: