From 8c7b66a2f53ce08fac1b187ee92edfa1ff7566ac Mon Sep 17 00:00:00 2001 From: fuzzball Date: Wed, 8 Mar 2023 00:21:33 +0900 Subject: [PATCH] Get error count from recent redumper log (#462) * Get error count from recent redumper log * Revert "Get error count from recent redumper log" This reverts commit 50f5f71686dafed5a83ae682c9d7f5805929d087. * Fix to keep existing code format --- MPF.Modules/Redumper/Parameters.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/MPF.Modules/Redumper/Parameters.cs b/MPF.Modules/Redumper/Parameters.cs index 18fe3aba..024debbb 100644 --- a/MPF.Modules/Redumper/Parameters.cs +++ b/MPF.Modules/Redumper/Parameters.cs @@ -189,7 +189,7 @@ namespace MPF.Modules.Redumper break; } - + return (true, new List()); } @@ -920,8 +920,11 @@ namespace MPF.Modules.Redumper { try { + const string startMarker = "CD-ROM ["; + const string redumpMarker = "REDUMP.ORG errors"; + // Fast forward to the errors lines - while (!sr.EndOfStream && !sr.ReadLine().Trim().StartsWith("data errors")); + while (!sr.EndOfStream && !sr.ReadLine().Trim().StartsWith(startMarker)); if (sr.EndOfStream) return 0; @@ -929,13 +932,13 @@ namespace MPF.Modules.Redumper long errorCount = 0; while (!sr.EndOfStream) { - // Skip forward to the "redump" line + // Skip forward to the redump error line string line; - while (!(line = sr.ReadLine().Trim()).StartsWith("redump")); + while (!(line = sr.ReadLine().Trim()).StartsWith(redumpMarker)); - // redump: + // Get the number from the error line string[] parts = line.Split(' '); - if (long.TryParse(parts[1], out long redump)) + if (long.TryParse(parts.Last(), out long redump)) errorCount += redump; else return -1; @@ -943,7 +946,7 @@ namespace MPF.Modules.Redumper if (!sr.EndOfStream) sr.ReadLine(); // Empty line - if (!sr.EndOfStream && !sr.ReadLine().Trim().StartsWith("data errors")) + if (!sr.EndOfStream && !sr.ReadLine().Trim().StartsWith(startMarker)) break; }