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

Print error when redump is down (#943)

Browse Source 
* Print error when redump is down

* code review
This commit is contained in:
Deterous
2026-02-18 21:53:09 +09:00
committed by GitHub
parent 5383ec230d
commit 782fcd0253
10 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MPF.CLI/MPF.CLI.csproj
View File

@@ -44,7 +44,7 @@
<ItemGroup>
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
</ItemGroup>
</Project>

2
MPF.Check/MPF.Check.csproj
View File

@@ -44,7 +44,7 @@
<ItemGroup>
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
</ItemGroup>
</Project>

2
MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj
View File

@@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.CodeCoverage" Version="18.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" />

2
MPF.ExecutionContexts/MPF.ExecutionContexts.csproj
View File

@@ -32,7 +32,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
</ItemGroup>
</Project>

2
MPF.Frontend.Test/MPF.Frontend.Test.csproj
View File

@@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.CodeCoverage" Version="18.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" />

2
MPF.Frontend/MPF.Frontend.csproj
View File

@@ -38,7 +38,7 @@
<PackageReference Include="MinThreadingBridge" Version="0.11.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
<PackageReference Include="System.Net.Http" Version="4.3.4" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
</ItemGroup>

27
MPF.Frontend/Tools/SubmissionGenerator.cs
View File

@@ -266,12 +266,17 @@ namespace MPF.Frontend.Tools
}
var foundIds = await Validator.ValidateSingleTrack(wc, info, sha1);
if (foundIds is not null && foundIds.Count == 1)
resultProgress?.Report(ResultEventArgs.Success($"Single match found for {sha1}"));
else if (foundIds is not null && foundIds.Count != 1)
resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for {sha1}"));
else
if (foundIds is null)
{
resultProgress?.Report(ResultEventArgs.Failure("Error accessing redump.org"));
return false;
}
else if (foundIds.Count == 0)
resultProgress?.Report(ResultEventArgs.Failure($"No matches found for {sha1}"));
else if (foundIds.Count == 1)
resultProgress?.Report(ResultEventArgs.Success($"Single match found for {sha1}"));
else
resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for {sha1}"));
// Add the found IDs to the map
foundIdSets.Add(foundIds?.ToArray() ?? []);
@@ -306,12 +311,14 @@ namespace MPF.Frontend.Tools
{
string sha1 = info.CommonDiscInfo.CommentsSpecialFields[SiteCode.UniversalHash];
var foundIds = await Validator.ValidateUniversalHash(wc, info);
if (foundIds is not null && foundIds.Count == 1)
resultProgress?.Report(ResultEventArgs.Success($"Single match found for universal hash {sha1}"));
else if (foundIds is not null && foundIds.Count != 1)
resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for universal hash {sha1}"));
else
if (foundIds is null)
resultProgress?.Report(ResultEventArgs.Failure("Error accessing redump.org"));
else if (foundIds.Count == 0)
resultProgress?.Report(ResultEventArgs.Failure($"No matches found for universal hash {sha1}"));
else if (foundIds.Count == 1)
resultProgress?.Report(ResultEventArgs.Success($"Single match found for universal hash {sha1}"));
else
resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for universal hash {sha1}"));
// Ensure that the hash is found
allFound = foundIds is not null && foundIds.Count == 1;

2
MPF.Processors.Test/MPF.Processors.Test.csproj
View File

@@ -27,7 +27,7 @@
<PackageReference Include="Microsoft.CodeCoverage" Version="18.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="1.27.0" />

2
MPF.Processors/MPF.Processors.csproj
View File

@@ -35,7 +35,7 @@
<PackageReference Include="GrindCore.SharpCompress" Version="0.41.1" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
<PackageReference Include="SabreTools.Hashing" Version="[1.6.0]" />
<PackageReference Include="SabreTools.IO" Version="[1.9.0]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
<PackageReference Include="SabreTools.Serialization" Version="[2.2.1]" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
</ItemGroup>

2
MPF.UI/MPF.UI.csproj
View File

@@ -70,7 +70,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.1]" />
<PackageReference Include="SabreTools.RedumpLib" Version="[1.9.2]" />
</ItemGroup>
<ItemGroup>