Skip to content

Repair incomplete SS files #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Deterous wants to merge 21 commits into
base: master
Choose a base branch
from
+376 −177
Draft

Repair incomplete SS files #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
07d8a5d
Cleanup SS handling
Deterous Jan 28, 2026
fbaf667
Fix SS validity check
Deterous Jan 28, 2026
0e9dc60
Clean SS for DIC dumps too
Deterous Jan 28, 2026
67e5401
Fix build
Deterous Jan 28, 2026
1cef42a
Account for net20
Deterous Jan 28, 2026
47db8ae
Account for old dotnet
Deterous Jan 28, 2026
9fb4f20
Fix tests
Deterous Jan 28, 2026
dc9f81d
decrypt response table
Deterous Jan 29, 2026
17e75fe
Merge branch 'SabreTools:master' into master
Deterous Jan 30, 2026
28d63a1
Update ProcessingTool.cs
Deterous Jan 30, 2026
7dcb946
Repair CCRT
Deterous Jan 30, 2026
9b184a9
fix
Deterous Feb 8, 2026
286c3c5
Merge branch 'SabreTools:master' into repair-ss
Deterous Feb 8, 2026
940b02c
Merge branch 'SabreTools:master' into repair-ss
Deterous Feb 24, 2026
7afd568
fix build
Deterous Feb 24, 2026
624590f
fix
Deterous Feb 24, 2026
d13f497
cid value is int
Deterous Feb 24, 2026
53d2201
code review
Deterous Feb 24, 2026
3647162
fix
Deterous Feb 24, 2026
79cb6ca
fix
Deterous Feb 24, 2026
b1b590e
Merge from main
Deterous Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MPF.Processors.Test/DiscImageCreatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public void GetOutputFiles_DVD_Populated()
var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);

var actual = processor.GetOutputFiles(MediaType.DVD, outputDirectory, outputFilename);
Assert.Equal(16, actual.Count);
Assert.Equal(17, actual.Count);
}

[Fact]
Expand All @@ -128,7 +128,7 @@ public void GetOutputFiles_NintendoGameCubeGameDisc_Populated()
var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);

var actual = processor.GetOutputFiles(MediaType.NintendoGameCubeGameDisc, outputDirectory, outputFilename);
Assert.Equal(16, actual.Count);
Assert.Equal(17, actual.Count);
}

[Fact]
Expand All @@ -139,7 +139,7 @@ public void GetOutputFiles_NintendoWiiOpticalDisc_Populated()
var processor = new DiscImageCreator(RedumpSystem.IBMPCcompatible);

var actual = processor.GetOutputFiles(MediaType.NintendoWiiOpticalDisc, outputDirectory, outputFilename);
Assert.Equal(16, actual.Count);
Assert.Equal(17, actual.Count);
}

[Fact]
Expand Down
58 changes: 54 additions & 4 deletions MPF.Processors/DiscImageCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using System.Text.RegularExpressions;
using MPF.Processors.OutputFiles;
using SabreTools.Data.Models.Logiqx;
using SabreTools.Hashing;
using SabreTools.RedumpLib.Data;
#if NET462_OR_GREATER || NETCOREAPP
using SharpCompress.Archives;
Expand Down Expand Up @@ -345,7 +346,8 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, MediaType? medi
{
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = xgd1DMIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd1PFIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash ?? string.Empty;
// Don't put raw SS hash from _suppl.dat / _disc.txt in submission info
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash ?? string.Empty;
}

if (GetXGDAuxInfo($"{basePath}_disc.txt", out _, out _, out _, out var xgd1SS))
Expand All @@ -359,11 +361,33 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, MediaType? medi
{
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = xgd1DMIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd1PFIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash ?? string.Empty;
// Don't put raw SS hash from _suppl.dat / _disc.txt in submission info
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSHash ?? string.Empty;
info.Extras.SecuritySectorRanges = xgd1SS ?? string.Empty;
}
}

string xgd1SSPath = $"{basePath}_SS.bin";
string xgd1RawSSPath = $"{basePath}_RawSS.bin";
if (File.Exists(xgd1SSPath) && ProcessingTool.IsValidSS(xgd1SSPath))
{
// Save untouched SS
try
{
if (!File.Exists(xgd1RawSSPath))
File.Move(xgd1SSPath, xgd1RawSSPath);
}
catch { }

// Repair, clean, and validate SS before adding hash to submission info
if (ProcessingTool.FixSS(xgd1SSPath, xgd1SSPath))
{
string? xgd1SSCrc = HashTool.GetFileHash(xgd1SSPath, HashType.CRC32);
if (xgd1SSCrc is not null)
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd1SSCrc.ToUpperInvariant();
}
}

break;

case RedumpSystem.MicrosoftXbox360:
Expand All @@ -387,7 +411,8 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, MediaType? medi
{
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = xgd23DMIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd23PFIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash ?? string.Empty;
// Don't put raw SS hash from _suppl.dat / _disc.txt in submission info
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash ?? string.Empty;
}

if (GetXGDAuxInfo($"{basePath}_disc.txt", out _, out _, out _, out var xgd23SS))
Expand All @@ -401,11 +426,33 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, MediaType? medi
{
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = xgd23DMIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = xgd23PFIHash ?? string.Empty;
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash ?? string.Empty;
// Don't put raw SS hash from _suppl.dat / _disc.txt in submission info
//info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd23SSHash ?? string.Empty;
info.Extras.SecuritySectorRanges = xgd23SS ?? string.Empty;
}
}

string xgd2SSPath = $"{basePath}_SS.bin";
string xgd2RawSSPath = $"{basePath}_RawSS.bin";
if (File.Exists(xgd2SSPath) && ProcessingTool.IsValidSS(xgd2SSPath))
{
// Save untouched SS
try
{
if (!File.Exists(xgd2RawSSPath))
File.Move(xgd2SSPath, xgd2RawSSPath);
}
catch { }

// Repair, clean, and validate SS before adding hash to submission info
if (ProcessingTool.FixSS(xgd2SSPath, xgd2SSPath))
{
string? xgd2SSCrc = HashTool.GetFileHash(xgd2SSPath, HashType.CRC32);
if (xgd2SSCrc is not null)
info.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = xgd2SSCrc.ToUpperInvariant();
}
}

break;

case RedumpSystem.NamcoSegaNintendoTriforce:
Expand Down Expand Up @@ -787,6 +834,9 @@ internal override List<OutputFile> GetOutputFiles(MediaType? mediaType, string?
? OutputFileFlags.Required | OutputFileFlags.Binary | OutputFileFlags.Zippable
: OutputFileFlags.Binary | OutputFileFlags.Zippable,
"ss"),
new($"{outputFilename}_RawSS.bin",
OutputFileFlags.Binary | OutputFileFlags.Zippable,
"raw_ss"),
];

case MediaType.HDDVD:
Expand Down
Loading