From 301dbcd67344de10bb9aaaddb5af45dcae3682f1 Mon Sep 17 00:00:00 2001 From: 13xforever Date: Fri, 1 Jul 2022 14:25:37 +0500 Subject: [PATCH] more fixes to clean up data --- CompatBot/Database/Providers/HwInfoProvider.cs | 2 +- .../ResultFormatters/LogParserResultFormatter.cs | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CompatBot/Database/Providers/HwInfoProvider.cs b/CompatBot/Database/Providers/HwInfoProvider.cs index 48b7ca96..19ab1d3b 100644 --- a/CompatBot/Database/Providers/HwInfoProvider.cs +++ b/CompatBot/Database/Providers/HwInfoProvider.cs @@ -87,7 +87,7 @@ internal static class HwInfoProvider private static byte[] GetHwId(NameValueCollection items, DiscordMessage message) { - var id = items["hw_id"] ?? message.Author.Id.ToString("x16") + items["compat_database_path"]; + var id = items["hw_id"] ?? (message.Author.Id.ToString("x16") + items["compat_database_path"]); return Utf8.GetBytes(id).GetSaltedHash(); } diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs index bcb3ec77..b9aa9c38 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs @@ -363,7 +363,7 @@ internal static partial class LogParserResult if (gpuName.EndsWith("(intel)", StringComparison.OrdinalIgnoreCase) || gpuName.EndsWith("(nvidia)", StringComparison.OrdinalIgnoreCase) || gpuName.EndsWith("(amd)", StringComparison.OrdinalIgnoreCase) - || gpuName.EndsWith("(ati)", StringComparison.OrdinalIgnoreCase) + || gpuName.EndsWith(" inc.)", StringComparison.OrdinalIgnoreCase) // ati || gpuName.EndsWith("(apple)", StringComparison.OrdinalIgnoreCase)) { var idx = gpuName.LastIndexOf('('); @@ -818,18 +818,21 @@ internal static partial class LogParserResult var kernelVersion = release; if (LinuxKernelVersion.Match(release) is {Success: true} m) kernelVersion = m.Groups["version"].Value; - if (version.Contains("Ubuntu", StringComparison.InvariantCultureIgnoreCase)) + if (version.Contains("Ubuntu", StringComparison.OrdinalIgnoreCase)) return "Ubuntu " + kernelVersion; - if (version.Contains("Debian", StringComparison.InvariantCultureIgnoreCase)) + if (version.Contains("Debian", StringComparison.OrdinalIgnoreCase)) return "Debian " + kernelVersion; - if (release.Contains("-MANJARO", StringComparison.InvariantCultureIgnoreCase)) + if (release.Contains("-MANJARO", StringComparison.OrdinalIgnoreCase)) return "Manjaro " + kernelVersion; - if (release.Contains("-ARCH", StringComparison.InvariantCultureIgnoreCase)) + if (release.Contains("-ARCH", StringComparison.OrdinalIgnoreCase)) return "Arch " + kernelVersion; + if (release.Contains("-gentoo", StringComparison.OrdinalIgnoreCase)) + return "Gentoo " + kernelVersion; + if (release.Contains(".fc")) { var ver = release.Split('.').FirstOrDefault(p => p.StartsWith("fc"))?[2..];