diff --git a/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs b/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs index ca850d0c..6e2fd557 100644 --- a/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs +++ b/CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs @@ -181,7 +181,7 @@ namespace CompatBot.EventHandlers.LogParsing ["Pad handler expected but none initialized"] = new Regex(@"(?Pad handler expected but none initialized).*?\r?$", DefaultOptions), ["XAudio2Thread"] = new Regex(@"XAudio2Thread\s*: (?.+failed\s*\((?0x.+)\).*)\r?$", DefaultOptions), ["cellAudio Thread"] = new Regex(@"XAudio2Backend\s*: (?.+failed\s*\((?0x.+)\).*)\r?$", DefaultOptions), - ["PPU executable hash:"] = new Regex(@"PPU executable hash: PPU-(?\w+) \(<-\s*(?(?!0)\d+)\).*?\r?$", DefaultOptions), + ["PPU executable hash:"] = new Regex(@"PPU executable hash: PPU-(?\w+) \(<-\s*(?\d+)\).*?\r?$", DefaultOptions), ["OVL executable hash:"] = new Regex(@"OVL executable hash: OVL-(?\w+) \(<-\s*(?(?!0)\d+)\).*?\r?$", DefaultOptions), ["Loaded SPU image:"] = new Regex(@"Loaded SPU image: SPU-(?\w+) \(<-\s*(?(?!0)\d+)\).*?\r?$", DefaultOptions), ["'sys_fs_open' failed"] = new Regex(@"'sys_fs_open' failed .+\xE2\x80\x9C/dev_bdvd/(?.+)\xE2\x80\x9D.*?\r?$", DefaultOptions), diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs index 0c94936e..4619924d 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs @@ -368,6 +368,17 @@ namespace CompatBot.Utils.ResultFormatters if (ppuPatches.Values.Any(n => n == 12 || n == 12+27)) notes.Add("⚠ An old version of the 60 fps patch is used"); } + if (items["ppu_hash"] is string ppuHashes + && ppuHashes.Split(Environment.NewLine, 2, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault() is string firstPpuHash + && !string.IsNullOrEmpty(firstPpuHash)) + { + var exe = Path.GetFileName(items["elf_boot_path"] ?? ""); + if (string.IsNullOrEmpty(exe) || exe.Equals("EBOOT.BIN", StringComparison.InvariantCultureIgnoreCase)) + exe = "Main"; + else + exe = $"`{exe}`"; + notes.Add($"ℹ {exe} hash: `PPU-{firstPpuHash}`"); + } bool discInsideGame = false; bool discAsPkg = false; diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs index d405282b..dec6a66b 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs @@ -655,7 +655,8 @@ namespace CompatBot.Utils.ResultFormatters for (var i = 0; i < hashes.Length; i++) { int.TryParse(patches[i], out var pCount); - result[hashes[i]] = pCount; + if (pCount > 0) + result[hashes[i]] = pCount; } return result; }