diff --git a/MPF.CLI/MPF.CLI.csproj b/MPF.CLI/MPF.CLI.csproj index f93a5e4ab..70175ceaf 100644 --- a/MPF.CLI/MPF.CLI.csproj +++ b/MPF.CLI/MPF.CLI.csproj @@ -44,7 +44,7 @@ - + \ No newline at end of file diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj index 7b3958949..35bfb213e 100644 --- a/MPF.Check/MPF.Check.csproj +++ b/MPF.Check/MPF.Check.csproj @@ -44,7 +44,7 @@ - + \ No newline at end of file diff --git a/MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj b/MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj index 4a4551295..a5927b2c8 100644 --- a/MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj +++ b/MPF.ExecutionContexts.Test/MPF.ExecutionContexts.Test.csproj @@ -17,7 +17,7 @@ - + diff --git a/MPF.ExecutionContexts/MPF.ExecutionContexts.csproj b/MPF.ExecutionContexts/MPF.ExecutionContexts.csproj index a12d096ee..21fe997d9 100644 --- a/MPF.ExecutionContexts/MPF.ExecutionContexts.csproj +++ b/MPF.ExecutionContexts/MPF.ExecutionContexts.csproj @@ -32,7 +32,7 @@ - + \ No newline at end of file diff --git a/MPF.Frontend.Test/MPF.Frontend.Test.csproj b/MPF.Frontend.Test/MPF.Frontend.Test.csproj index 6f3d84c42..257d8d880 100644 --- a/MPF.Frontend.Test/MPF.Frontend.Test.csproj +++ b/MPF.Frontend.Test/MPF.Frontend.Test.csproj @@ -17,7 +17,7 @@ - + diff --git a/MPF.Frontend/MPF.Frontend.csproj b/MPF.Frontend/MPF.Frontend.csproj index a3ca61566..47706e35e 100644 --- a/MPF.Frontend/MPF.Frontend.csproj +++ b/MPF.Frontend/MPF.Frontend.csproj @@ -38,7 +38,7 @@ - + diff --git a/MPF.Frontend/Tools/SubmissionGenerator.cs b/MPF.Frontend/Tools/SubmissionGenerator.cs index 3fe8232e5..4c42495eb 100644 --- a/MPF.Frontend/Tools/SubmissionGenerator.cs +++ b/MPF.Frontend/Tools/SubmissionGenerator.cs @@ -266,12 +266,17 @@ public static async Task FillFromRedump(Options options, } var foundIds = await Validator.ValidateSingleTrack(wc, info, sha1); - if (foundIds is not null && foundIds.Count == 1) + 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 if (foundIds is not null && foundIds.Count != 1) - resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for {sha1}")); else - resultProgress?.Report(ResultEventArgs.Failure($"No matches found for {sha1}")); + resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for {sha1}")); // Add the found IDs to the map foundIdSets.Add(foundIds?.ToArray() ?? []); @@ -306,12 +311,14 @@ public static async Task FillFromRedump(Options options, { string sha1 = info.CommonDiscInfo.CommentsSpecialFields[SiteCode.UniversalHash]; var foundIds = await Validator.ValidateUniversalHash(wc, info); - if (foundIds is not null && foundIds.Count == 1) + 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 if (foundIds is not null && foundIds.Count != 1) - resultProgress?.Report(ResultEventArgs.Success($"Multiple matches found for universal hash {sha1}")); else - resultProgress?.Report(ResultEventArgs.Failure($"No matches found for universal hash {sha1}")); + 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; diff --git a/MPF.Processors.Test/MPF.Processors.Test.csproj b/MPF.Processors.Test/MPF.Processors.Test.csproj index 03cd9aae3..98394161e 100644 --- a/MPF.Processors.Test/MPF.Processors.Test.csproj +++ b/MPF.Processors.Test/MPF.Processors.Test.csproj @@ -27,7 +27,7 @@ - + diff --git a/MPF.Processors/MPF.Processors.csproj b/MPF.Processors/MPF.Processors.csproj index ab4d0c7d3..3f505fadc 100644 --- a/MPF.Processors/MPF.Processors.csproj +++ b/MPF.Processors/MPF.Processors.csproj @@ -35,7 +35,7 @@ - + diff --git a/MPF.UI/MPF.UI.csproj b/MPF.UI/MPF.UI.csproj index 440826053..2d53ff506 100644 --- a/MPF.UI/MPF.UI.csproj +++ b/MPF.UI/MPF.UI.csproj @@ -70,7 +70,7 @@ - +