RPCS3/discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2025-02-17 08:20:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

more fixes to clean up data

Browse Source
This commit is contained in:
13xforever 2022-07-01 14:25:37 +05:00
parent e37ddfc373
commit 301dbcd673
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CompatBot/Database/Providers/HwInfoProvider.cs
View File

@ -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();
}

13
CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
View File

@ -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..];