Ensure consistency in frontend code

This commit is contained in:
Matt Nadareski
2024-12-05 22:45:53 -05:00
parent c8a402ee64
commit 075a95ef4c
6 changed files with 16 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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

View File

@@ -702,6 +702,7 @@ namespace MPF.Processors
case MediaType.HDDVD:
case MediaType.BluRay:
case MediaType.NintendoWiiUOpticalDisc:
return [
new($"{baseFilename}.dat", OutputFileFlags.Required
| OutputFileFlags.Zippable),

View File

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