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

Update Redumper to build 416

Browse Source
This commit is contained in:
Matt Nadareski
2024-10-12 20:13:27 -04:00
parent 83a189a5d3
commit 172a0fb5dc
4 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_ui.yml vendored
View File

@@ -37,10 +37,10 @@ jobs:
- name: Bundle Redumper - name: Bundle Redumper
run: | run: |
wget https://github.com/superg/redumper/releases/download/build_371/redumper-2024.05.27_build371-win64.zip wget https://github.com/superg/redumper/releases/download/build_416/redumper-2024.10.12_build416-win64.zip
unzip redumper-2024.05.27_build371-win64.zip unzip redumper-2024.10.12_build416-win64.zip
mkdir -p MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper mkdir -p MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper
mv redumper-2024.05.27_build371-win64/bin/redumper.exe MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper/ mv redumper-2024.10.12_build416-win64/bin/redumper.exe MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper/
- name: Archive build - name: Archive build
run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/ run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/

1
CHANGELIST.md
View File

@@ -11,6 +11,7 @@
- Remove ReadLine in list commands - Remove ReadLine in list commands
- Sum track errors in Redumper - Sum track errors in Redumper
- Format CleanRip BCA wtih 2-byte blocks - Format CleanRip BCA wtih 2-byte blocks
- Update Redumper to build 416
### 3.2.2 (2024-09-24) ### 3.2.2 (2024-09-24)

57
MPF.Processors/DiscImageCreator.cs
View File

@@ -328,12 +328,15 @@ namespace MPF.Processors
if (!string.IsNullOrEmpty(info.Extras.Header)) if (!string.IsNullOrEmpty(info.Extras.Header))
info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray()); info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate)) if (GetGDROMBuildInfo(info.Extras.Header,
out var serial,
out var version,
out var date))
{ {
// Ensure internal serial is pulled from local data // Ensure internal serial is pulled from local data
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty; info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
info.VersionAndEditions!.Version = gdVersion ?? string.Empty; info.VersionAndEditions!.Version = version ?? string.Empty;
info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty; info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
} }
} }
@@ -364,12 +367,15 @@ namespace MPF.Processors
if (!string.IsNullOrEmpty(info.Extras.Header)) if (!string.IsNullOrEmpty(info.Extras.Header))
info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray()); info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate)) if (GetGDROMBuildInfo(info.Extras.Header,
out var serial,
out var version,
out var date))
{ {
// Ensure internal serial is pulled from local data // Ensure internal serial is pulled from local data
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty; info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
info.VersionAndEditions!.Version = gdVersion ?? string.Empty; info.VersionAndEditions!.Version = version ?? string.Empty;
info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty; info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
} }
} }
@@ -384,12 +390,15 @@ namespace MPF.Processors
if (!string.IsNullOrEmpty(info.Extras.Header)) if (!string.IsNullOrEmpty(info.Extras.Header))
info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray()); info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate)) if (GetGDROMBuildInfo(info.Extras.Header,
out var serial,
out var version,
out var date))
{ {
// Ensure internal serial is pulled from local data // Ensure internal serial is pulled from local data
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty; info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
info.VersionAndEditions!.Version = gdVersion ?? string.Empty; info.VersionAndEditions!.Version = version ?? string.Empty;
info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty; info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
} }
} }
@@ -404,12 +413,15 @@ namespace MPF.Processors
if (!string.IsNullOrEmpty(info.Extras.Header)) if (!string.IsNullOrEmpty(info.Extras.Header))
info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray()); info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate)) if (GetGDROMBuildInfo(info.Extras.Header,
out var serial,
out var version,
out var date))
{ {
// Ensure internal serial is pulled from local data // Ensure internal serial is pulled from local data
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty; info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
info.VersionAndEditions!.Version = gdVersion ?? string.Empty; info.VersionAndEditions!.Version = version ?? string.Empty;
info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty; info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
} }
} }
@@ -424,12 +436,15 @@ namespace MPF.Processors
if (!string.IsNullOrEmpty(info.Extras.Header)) if (!string.IsNullOrEmpty(info.Extras.Header))
info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray()); info.Extras.Header = string.Join("\n", info.Extras.Header.Split('\n').Take(16).ToArray());
if (GetGDROMBuildInfo(info.Extras.Header, out var gdSerial, out var gdVersion, out var gdDate)) if (GetGDROMBuildInfo(info.Extras.Header,
out var serial,
out var version,
out var date))
{ {
// Ensure internal serial is pulled from local data // Ensure internal serial is pulled from local data
info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = gdSerial ?? string.Empty; info.CommonDiscInfo!.CommentsSpecialFields![SiteCode.InternalSerialName] = serial ?? string.Empty;
info.VersionAndEditions!.Version = gdVersion ?? string.Empty; info.VersionAndEditions!.Version = version ?? string.Empty;
info.CommonDiscInfo.EXEDateBuildDate = gdDate ?? string.Empty; info.CommonDiscInfo.EXEDateBuildDate = date ?? string.Empty;
} }
} }
@@ -1899,7 +1914,7 @@ namespace MPF.Processors
while (sr.ReadLine()?.Trim()?.StartsWith("========== Offset") == false) ; while (sr.ReadLine()?.Trim()?.StartsWith("========== Offset") == false) ;
if (sr.EndOfStream) if (sr.EndOfStream)
break; break;
sr.ReadLine(); // Combined Offset sr.ReadLine(); // Combined Offset
sr.ReadLine(); // Drive Offset sr.ReadLine(); // Drive Offset
sr.ReadLine(); // Separator line sr.ReadLine(); // Separator line

16
MPF.Processors/Redumper.cs
View File

@@ -865,6 +865,10 @@ namespace MPF.Processors
{ {
buildDate = line.Substring("build date: ".Length).Trim(); buildDate = line.Substring("build date: ".Length).Trim();
} }
else if (line.StartsWith("version:"))
{
version = line.Substring("version: ".Length).Trim();
}
else if (line.StartsWith("serial:")) else if (line.StartsWith("serial:"))
{ {
serial = line.Substring("serial: ".Length).Trim(); serial = line.Substring("serial: ".Length).Trim();
@@ -877,10 +881,6 @@ namespace MPF.Processors
{ {
region = line.Substring("regions: ".Length).Trim(); region = line.Substring("regions: ".Length).Trim();
} }
else if (line.StartsWith("version:"))
{
version = line.Substring("version: ".Length).Trim();
}
else if (line.StartsWith("header:")) else if (line.StartsWith("header:"))
{ {
line = sr.ReadLine()?.TrimStart(); line = sr.ReadLine()?.TrimStart();
@@ -1445,6 +1445,10 @@ namespace MPF.Processors
{ {
buildDate = line.Substring("build date: ".Length).Trim(); buildDate = line.Substring("build date: ".Length).Trim();
} }
else if (line.StartsWith("version:"))
{
version = line.Substring("version: ".Length).Trim();
}
else if (line.StartsWith("serial:")) else if (line.StartsWith("serial:"))
{ {
serial = line.Substring("serial: ".Length).Trim(); serial = line.Substring("serial: ".Length).Trim();
@@ -1457,10 +1461,6 @@ namespace MPF.Processors
{ {
region = line.Substring("regions: ".Length).Trim(); region = line.Substring("regions: ".Length).Trim();
} }
else if (line.StartsWith("version:"))
{
version = line.Substring("version: ".Length).Trim();
}
else if (line?.StartsWith("header:") == true) else if (line?.StartsWith("header:") == true)
{ {
line = sr.ReadLine()?.TrimStart(); line = sr.ReadLine()?.TrimStart();