Merge branch 'vnext'

Author: 13xforever

CompatBot/Utils/ResultFormatters/LogParserResultFormatter.CurrentSettingsSections.cs

@@ -22,10 +22,18 @@ private static void BuildInfoSection(DiscordEmbedBuilder builder, NameValueColle
             if (idxEnd > 0)
                 systemInfo = systemInfo[..idxStart] + systemInfo[idxEnd..];
         }
-        var sysInfoParts = systemInfo.Split(NewLineChars, StringSplitOptions.RemoveEmptyEntries);
+        var sysInfoParts = systemInfo.Split(NewLineChars, StringSplitOptions.RemoveEmptyEntries).AsSpan();
         var buildInfo = BuildInfoInLog().Match(sysInfoParts.Length > 0 ? sysInfoParts[0] : systemInfo);
-        var cpuInfo = CpuInfoInLog().Match(sysInfoParts.Length > 1 ? sysInfoParts[1] : systemInfo);
-        var osInfo = LogParser.OsInfo().Match(sysInfoParts.Length > 2 ? sysInfoParts[2] : systemInfo);
+        var hasCpuInfo = false;
+        if (sysInfoParts.Length > 1)
+        {
+            sysInfoParts = sysInfoParts[1].StartsWith("Architecture:")
+                ? sysInfoParts[2..]
+                : sysInfoParts[1..];
+            hasCpuInfo = true;
+        }
+        var cpuInfo = CpuInfoInLog().Match(hasCpuInfo ? sysInfoParts[0] : systemInfo);
+        var osInfo = LogParser.OsInfo().Match(hasCpuInfo && sysInfoParts.Length > 1 ? sysInfoParts[1] : systemInfo);
         if (buildInfo.Success)
         {
             items["build_version"] = buildInfo.Groups["version"].Value.Trim();

CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs

@@ -279,7 +279,7 @@ private static async ValueTask BuildNotesSectionAsync(DiscordEmbedBuilder builde
             && ramSize < 6)
             notes.Add("⚠️ 8 GiB RAM or more is recommended for PS3 emulation");
 
-        if (GetCpuUsageStats(multiItems["total_cpu"]) is {avg: >50, max: >95 } cpuUsageStats)
+        if (GetCpuUsageStats(multiItems["total_cpu"]) is {avg: >50, max: >95} cpuUsageStats)
             notes.Add($"⚠️ CPU usage: {cpuUsageStats.avg:0.##}% (min: {cpuUsageStats.min:0.##}% / max: {cpuUsageStats.max:0.##}%)");
         if (GetMemUsageStats(multiItems["current_ram"]) is { avg: >0 } memUsageStats
             && ramSize > 0