SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-02-04 05:35:52 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

IsAudio cleanup

Browse Source
This commit is contained in:
Matt Nadareski
2025-06-18 08:52:51 -04:00
parent e23427d7c9
commit 86d8590789
3 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

@@ -14,6 +14,7 @@
- Fix start index in Check
- Use the correct base path for Check
- Update redumper to build 611
- IsAudio cleanup
### 3.3.2 (2025-06-12)

19
MPF.Processors/DiscImageCreator.cs
View File

@@ -199,8 +199,10 @@ namespace MPF.Processors
{
case MediaType.CDROM:
case MediaType.GDROM: // TODO: Verify GD-ROM outputs this
info.TracksAndWriteOffsets.Cuesheet = ProcessingTool.GetFullFile($"{basePath}.cue") ?? string.Empty;
// Audio-only discs will fail if there are any C2 errors, so they would never get here
if (System.IsAudio())
if (IsAudio(info.TracksAndWriteOffsets.Cuesheet))
{
info.CommonDiscInfo!.ErrorsCount = "0";
}
@@ -215,7 +217,6 @@ namespace MPF.Processors
info.CommonDiscInfo!.ErrorsCount = (errorCount == -1 ? "Error retrieving error count" : errorCount.ToString());
}
info.TracksAndWriteOffsets.Cuesheet = ProcessingTool.GetFullFile($"{basePath}.cue") ?? string.Empty;
break;
case MediaType.DVD:
@@ -575,6 +576,11 @@ namespace MPF.Processors
// Remove the extension by default
outputFilename = Path.GetFileNameWithoutExtension(outputFilename);
// Assemble the base path
string basePath = Path.GetFileNameWithoutExtension(outputFilename);
if (!string.IsNullOrEmpty(outputDirectory))
basePath = Path.Combine(outputDirectory, basePath);
switch (mediaType)
{
case MediaType.CDROM:
@@ -591,13 +597,10 @@ namespace MPF.Processors
| OutputFileFlags.Zippable),
new($"{outputFilename}.img", OutputFileFlags.Required
| OutputFileFlags.Deleteable),
new([$"{outputFilename}.img_EdcEcc.txt", $"{outputFilename}.img_EccEdc.txt"], System.IsAudio()
? OutputFileFlags.Artifact | OutputFileFlags.Zippable
: OutputFileFlags.Required | OutputFileFlags.Artifact | OutputFileFlags.Zippable,
new([$"{outputFilename}.img_EdcEcc.txt", $"{outputFilename}.img_EccEdc.txt"], OutputFileFlags.Artifact
| OutputFileFlags.Zippable,
"img_edcecc"),
new([$"{outputFilename}.scm", $"{outputFilename}.scmtmp"], System.IsAudio()
? OutputFileFlags.Deleteable
: OutputFileFlags.Required | OutputFileFlags.Deleteable),
new([$"{outputFilename}.scm", $"{outputFilename}.scmtmp"], OutputFileFlags.Deleteable),
new([$"{outputFilename}.sub", $"{outputFilename}.subtmp"], OutputFileFlags.Required
| OutputFileFlags.Binary
| OutputFileFlags.Zippable,

10
MPF.Processors/Redumper.cs
View File

@@ -447,12 +447,10 @@ namespace MPF.Processors
// Remove the extension by default
outputFilename = Path.GetFileNameWithoutExtension(outputFilename);
// Get the base path
string basePath;
if (string.IsNullOrEmpty(outputDirectory))
basePath = outputFilename;
else
basePath = Path.Combine(outputDirectory, outputFilename);
// Assemble the base path
string basePath = Path.GetFileNameWithoutExtension(outputFilename);
if (!string.IsNullOrEmpty(outputDirectory))
basePath = Path.Combine(outputDirectory, basePath);
switch (mediaType)
{