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 surface area of generation method

Browse Source
This commit is contained in:
Matt Nadareski
2024-05-21 17:09:24 -04:00
parent 26e65b428b
commit db92acfdcc
10 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -26,6 +26,7 @@
- Slight tweak to Result class variables
- Move constants into related classes
- Separate out artifact generation
- Reduce surface area of generation method
### 3.1.9a (2024-05-21)

2
MPF.Core/Processors/Aaru.cs
View File

@@ -101,7 +101,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
// TODO: Fill in submission info specifics for Aaru
var outputDirectory = Path.GetDirectoryName(basePath);

3
MPF.Core/Processors/BaseProcessor.cs
View File

@@ -64,7 +64,8 @@ namespace MPF.Core.Processors
/// <param name="options">Options object representing user-defined options</param>
/// <param name="basePath">Base filename and path to use for checking</param>
/// <param name="drive">Drive representing the disc to get information from</param>
public abstract void GenerateSubmissionInfo(SubmissionInfo submissionInfo, Options options, string basePath, Drive? drive);
/// <param name="redumpCompat">Determines if outputs are processed according to Redump specifications</param>
public abstract void GenerateSubmissionInfo(SubmissionInfo submissionInfo, string basePath, Drive? drive, bool redumpCompat);
#endregion

2
MPF.Core/Processors/CleanRip.cs
View File

@@ -60,7 +60,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
// Ensure that required sections exist
info = Builder.EnsureAllSections(info);

8
MPF.Core/Processors/DiscImageCreator.cs
View File

@@ -286,7 +286,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
var outputDirectory = Path.GetDirectoryName(basePath);
@@ -395,7 +395,7 @@ namespace MPF.Core.Processors
}
// Read the PVD
if (!options.EnableRedumpCompatibility || System != RedumpSystem.MicrosoftXbox)
if (!redumpCompat || System != RedumpSystem.MicrosoftXbox)
info.Extras!.PVD = GetPVD($"{basePath}_mainInfo.txt") ?? string.Empty;
// Bluray-specific options
@@ -476,7 +476,7 @@ namespace MPF.Core.Processors
{
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.XMID] = xmidString?.TrimEnd('\0') ?? string.Empty;
info.CommonDiscInfo.Serial = xmid.Serial ?? string.Empty;
if (!options.EnableRedumpCompatibility)
if (!redumpCompat)
info.VersionAndEditions!.Version = xmid.Version ?? string.Empty;
info.CommonDiscInfo.Region = InfoTool.GetXGDRegion(xmid.Model.RegionIdentifier);
@@ -525,7 +525,7 @@ namespace MPF.Core.Processors
{
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.XeMID] = xemidString?.TrimEnd('\0') ?? string.Empty;
info.CommonDiscInfo.Serial = xemid.Serial ?? string.Empty;
if (!options.EnableRedumpCompatibility)
if (!redumpCompat)
info.VersionAndEditions!.Version = xemid.Version ?? string.Empty;
info.CommonDiscInfo.Region = InfoTool.GetXGDRegion(xemid.Model.RegionIdentifier);

2
MPF.Core/Processors/PS3CFW.cs
View File

@@ -55,7 +55,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
// Ensure that required sections exist
info = Builder.EnsureAllSections(info);

2
MPF.Core/Processors/Redumper.cs
View File

@@ -172,7 +172,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
// Ensure that required sections exist
info = Builder.EnsureAllSections(info);

2
MPF.Core/Processors/UmdImageCreator.cs
View File

@@ -70,7 +70,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
// Ensure that required sections exist
info = Builder.EnsureAllSections(info);

6
MPF.Core/Processors/XboxBackupCreator.cs
View File

@@ -80,7 +80,7 @@ namespace MPF.Core.Processors
}
/// <inheritdoc/>
public override void GenerateSubmissionInfo(SubmissionInfo info, Options options, string basePath, Drive? drive)
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive? drive, bool redumpCompat)
{
// Ensure that required sections exist
info = Builder.EnsureAllSections(info);
@@ -140,7 +140,7 @@ namespace MPF.Core.Processors
{
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.XMID] = xmidString?.TrimEnd('\0') ?? string.Empty;
info.CommonDiscInfo.Serial = xmid.Serial ?? string.Empty;
if (!options.EnableRedumpCompatibility)
if (!redumpCompat)
info.VersionAndEditions!.Version = xmid.Version ?? string.Empty;
info.CommonDiscInfo.Region = InfoTool.GetXGDRegion(xmid.Model.RegionIdentifier);
@@ -164,7 +164,7 @@ namespace MPF.Core.Processors
{
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.XeMID] = xemidString?.TrimEnd('\0') ?? string.Empty;
info.CommonDiscInfo.Serial = xemid.Serial ?? string.Empty;
if (!options.EnableRedumpCompatibility)
if (!redumpCompat)
info.VersionAndEditions!.Version = xemid.Version ?? string.Empty;
info.CommonDiscInfo.Region = InfoTool.GetXGDRegion(xemid.Model.RegionIdentifier);

2
MPF.Core/SubmissionInfoTool.cs
View File

@@ -83,7 +83,7 @@ namespace MPF.Core
SubmissionInfo info = CreateDefaultSubmissionInfo(system, mediaType, options.AddPlaceholders);
// Get specific tool output handling
processor?.GenerateSubmissionInfo(info, options, combinedBase, drive);
processor?.GenerateSubmissionInfo(info, combinedBase, drive, options.EnableRedumpCompatibility);
if (options.IncludeArtifacts)
processor?.GenerateArtifacts(info, combinedBase);