SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Reduce complexity of ProcessSystem method

Browse Source
This commit is contained in:
Matt Nadareski
2024-05-22 16:44:18 -04:00
parent 4e5c9a242e
commit b003203aef
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -64,6 +64,7 @@
- Make system private to DumpEnvironment
- Make drive private to DumpEnvironment
- Simplify RequiredProgramsExist logic
- Reduce complexity of ProcessSystem method
### 3.1.9a (2024-05-21)

35
MPF.Core/SubmissionInfoTool.cs
View File

@@ -106,7 +106,15 @@ namespace MPF.Core
ProcessMediaType(info, mediaType, options.AddPlaceholders);
// Extract info based specifically on RedumpSystem
_ = await ProcessSystem(info, system, drive, options.AddPlaceholders, resultProgress);
ProcessSystem(info, system, drive, options.AddPlaceholders);
// Run anti-modchip check, if necessary
if (drive != null && SupportsAntiModchipScans(system) && info.CopyProtection!.AntiModchip == YesNo.NULL)
{
resultProgress?.Report(ResultEventArgs.Success("Checking for anti-modchip strings... this might take a while!"));
info.CopyProtection.AntiModchip = await InfoTool.GetAntiModchipDetected(drive) ? YesNo.Yes : YesNo.No;
resultProgress?.Report(ResultEventArgs.Success("Anti-modchip string scan complete!"));
}
// Run copy protection, if possible or necessary
if (SupportsCopyProtectionScans(system))
@@ -581,11 +589,7 @@ namespace MPF.Core
/// <summary>
/// Processes default data based on system type
/// </summary>
private static async Task<bool> ProcessSystem(SubmissionInfo info,
RedumpSystem? system,
Drive? drive,
bool addPlaceholders,
IProgress<ResultEventArgs>? resultProgress = null)
private static bool ProcessSystem(SubmissionInfo info, RedumpSystem? system, Drive? drive, bool addPlaceholders)
{
// Extract info based specifically on RedumpSystem
switch (system)
@@ -796,13 +800,6 @@ namespace MPF.Core
}
}
if (drive != null && info.CopyProtection!.AntiModchip == YesNo.NULL)
{
resultProgress?.Report(ResultEventArgs.Success("Checking for anti-modchip strings... this might take a while!"));
info.CopyProtection.AntiModchip = await InfoTool.GetAntiModchipDetected(drive) ? YesNo.Yes : YesNo.No;
resultProgress?.Report(ResultEventArgs.Success("Anti-modchip string scan complete!"));
}
break;
case RedumpSystem.SonyPlayStation2:
@@ -876,6 +873,18 @@ namespace MPF.Core
return true;
}
/// <summary>
/// Helper to determine if a system requires an anti-modchip scan
/// </summary>
private static bool SupportsAntiModchipScans(RedumpSystem? system)
{
return system switch
{
RedumpSystem.SonyPlayStation => true,
_ => false,
};
}
/// <summary>
/// Helper to determine if a system requires a copy protection scan
/// </summary>