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

Merge pull request #319 from 13xforever/vnext

Browse Source 
Update some notes for log results
This commit is contained in:
Ilya 2019-05-17 18:25:19 +05:00 committed by GitHub
commit 67bc2e3145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CompatBot/EventHandlers/LogParsing/LogParser.LogSections.cs
View File

@ -47,7 +47,7 @@ namespace CompatBot.EventHandlers.LogParsing
["Title:"] = new Regex(@"Title: (?<game_title>.*)?\r?$", DefaultOptions),
["Category:"] = new Regex(@"Category: (?<game_category>.*)?\r?$", DefaultOptions),
["LDR:"] = new Regex(@"(Path|Cache): ((?<win_path>\w:/)|(?<lin_path>/[^/])).*?\r?$", DefaultOptions),
["custom config:"] = new Regex("custom config: (?<custom_config>.*?)\r?$", DefaultOptions),
["custom config:"] = new Regex(@"custom config: (?<custom_config>.*?)\r?$", DefaultOptions),
},
OnNewLineAsync = PiracyCheckAsync,
EndTrigger = "Core:",
@ -56,23 +56,24 @@ namespace CompatBot.EventHandlers.LogParsing
{
Extractors = new Dictionary<string, Regex>
{
["PPU Decoder:"] = new Regex("PPU Decoder: (?<ppu_decoder>.*?)\r?$", DefaultOptions),
["PPU Threads:"] = new Regex("Threads: (?<ppu_threads>.*?)\r?$", DefaultOptions),
["PPU Decoder:"] = new Regex(@"PPU Decoder: (?<ppu_decoder>.*?)\r?$", DefaultOptions),
["PPU Threads:"] = new Regex(@"Threads: (?<ppu_threads>.*?)\r?$", DefaultOptions),
["Use LLVM CPU:"] = new Regex("Use LLVM CPU: \\\"?(?<llvm_arch>.*?)\\\"?\r?$", DefaultOptions),
["thread scheduler:"] = new Regex("scheduler: (?<thread_scheduler>.*?)\r?$", DefaultOptions),
["SPU Decoder:"] = new Regex("SPU Decoder: (?<spu_decoder>.*?)\r?$", DefaultOptions),
["secondary cores:"] = new Regex("secondary cores: (?<spu_secondary_cores>.*?)\r?$", DefaultOptions),
["priority:"] = new Regex("priority: (?<spu_lower_thread_priority>.*?)\r?$", DefaultOptions),
["SPU Threads:"] = new Regex("SPU Threads: (?<spu_threads>.*?)\r?$", DefaultOptions),
["SPU delay penalty:"] = new Regex("SPU delay penalty: (?<spu_delay_penalty>.*?)\r?$", DefaultOptions),
["SPU loop detection:"] = new Regex("SPU loop detection: (?<spu_loop_detection>.*?)\r?$", DefaultOptions),
["SPU Block Size:"] = new Regex("SPU Block Size: (?<spu_block_size>.*?)\r?$", DefaultOptions),
["Enable TSX:"] = new Regex("Enable TSX: (?<enable_tsx>.*?)\r?$", DefaultOptions),
["Accurate xfloat:"] = new Regex("Accurate xfloat: (?<accurate_xfloat>.*?)\r?$", DefaultOptions),
["Approximate xfloat:"] = new Regex("Approximate xfloat: (?<approximate_xfloat>.*?)\r?$", DefaultOptions),
["Debug Console Mode:"] = new Regex("Debug Console Mode: (?<debug_console_mode>.*?)\r?$", DefaultOptions),
["Lib Loader:"] = new Regex("[Ll]oader: (?<lib_loader>.*?)\r?$", DefaultOptions),
["Hook static functions:"] = new Regex("Hook static functions: (?<hook_static_functions>.*?)\r?$", DefaultOptions),
["thread scheduler:"] = new Regex(@"scheduler: (?<thread_scheduler>.*?)\r?$", DefaultOptions),
["SPU Decoder:"] = new Regex(@"SPU Decoder: (?<spu_decoder>.*?)\r?$", DefaultOptions),
["secondary cores:"] = new Regex(@"secondary cores: (?<spu_secondary_cores>.*?)\r?$", DefaultOptions),
["priority:"] = new Regex(@"priority: (?<spu_lower_thread_priority>.*?)\r?$", DefaultOptions),
["SPU Threads:"] = new Regex(@"SPU Threads: (?<spu_threads>.*?)\r?$", DefaultOptions),
["SPU delay penalty:"] = new Regex(@"SPU delay penalty: (?<spu_delay_penalty>.*?)\r?$", DefaultOptions),
["SPU loop detection:"] = new Regex(@"SPU loop detection: (?<spu_loop_detection>.*?)\r?$", DefaultOptions),
["Max SPURS Threads:"] = new Regex(@"Max SPURS Threads: (?<spurs_threads>\d*?)\r?$", DefaultOptions),
["SPU Block Size:"] = new Regex(@"SPU Block Size: (?<spu_block_size>.*?)\r?$", DefaultOptions),
["Enable TSX:"] = new Regex(@"Enable TSX: (?<enable_tsx>.*?)\r?$", DefaultOptions),
["Accurate xfloat:"] = new Regex(@"Accurate xfloat: (?<accurate_xfloat>.*?)\r?$", DefaultOptions),
["Approximate xfloat:"] = new Regex(@"Approximate xfloat: (?<approximate_xfloat>.*?)\r?$", DefaultOptions),
["Debug Console Mode:"] = new Regex(@"Debug Console Mode: (?<debug_console_mode>.*?)\r?$", DefaultOptions),
["Lib Loader:"] = new Regex(@"[Ll]oader: (?<lib_loader>.*?)\r?$", DefaultOptions),
["Hook static functions:"] = new Regex(@"Hook static functions: (?<hook_static_functions>.*?)\r?$", DefaultOptions),
["Load libraries:"] = new Regex(@"libraries:\r?\n(?<library_list>(.*?(- .*?|\[\])\r?\n)+)", DefaultOptions),
["HLE lwmutex:"] = new Regex(@"HLE lwmutex: (?<hle_lwmutex>.*?)\r?$", DefaultOptions),
},
@ -82,7 +83,7 @@ namespace CompatBot.EventHandlers.LogParsing
{
Extractors = new Dictionary<string, Regex>
{
["Enable /host_root/:"] = new Regex("Enable /host_root/: (?<host_root>.*?)\r?$", DefaultOptions),
["Enable /host_root/:"] = new Regex(@"Enable /host_root/: (?<host_root>.*?)\r?$", DefaultOptions),
},
EndTrigger = "Video:",
},

2
CompatBot/Program.cs
View File

@ -128,7 +128,6 @@ namespace CompatBot
Config.Log.Info($"Bot user id : {r.Client.CurrentUser.Id} ({r.Client.CurrentUser.Username})");
Config.Log.Info($"Bot admin id : {Config.BotAdminId} ({(await r.Client.GetUserAsync(Config.BotAdminId)).Username})");
Config.Log.Info("");
Watchdog.DisconnectTimestamps.Clear();
};
client.GuildAvailable += async gaArgs =>
{
@ -219,6 +218,7 @@ namespace CompatBot
}
logLevel(eventArgs.Exception, eventArgs.Message);
};
Watchdog.DisconnectTimestamps.Enqueue(DateTime.UtcNow);
await client.ConnectAsync();
if (args.Length > 1 && ulong.TryParse(args[1], out var channelId))
{

2
CompatBot/Utils/ResultFormatters/LogParserResultFormatter.CurrentSettingsSections.cs
View File

@ -125,6 +125,7 @@ namespace CompatBot.Utils.ResultFormatters
$"SPU Decoder: {items["spu_decoder"],21}",
$"SPU Lower Thread Priority: {items["spu_lower_thread_priority"],7}",
$"SPU Loop Detection: {items["spu_loop_detection"],14}",
$"Thread Scheduler: {items["thread_scheduler"],16}",
$"SPU Threads: {items["spu_threads"],21}",
$"SPU Block Size: {items["spu_block_size"] ?? "N/A",18}",
$"Accurate xfloat: {items["accurate_xfloat"] ?? "N/A",17}",
@ -150,6 +151,7 @@ namespace CompatBot.Utils.ResultFormatters
$"Anisotropic Filter: {items["af_override"] ?? "N/A",14}",
$"Frame Limit: {items["frame_limit"],21}",
$"VSync: {items["vsync"] ?? "N/A",27}",
$"Native UI: {items["native_ui"] ?? "N/A",23}"
};
return ("GPU Settings", lines);
}

10
CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs
View File

@ -71,6 +71,16 @@ namespace CompatBot.Utils.ResultFormatters
notes.Add("⚠ `Hook Static Functions` is enabled, please disable");
if (items["host_root"] is string hostRoot && hostRoot == EnabledMark)
notes.Add("❔ `/host_root/` is enabled");
if (items["spurs_threads"] is string spursSetting
&& int.TryParse(spursSetting, out var spursThreads)
&& spursThreads != 6)
{
if (spursThreads > 6 || spursThreads < 1)
notes.Add($"⚠ `Max SPURS Threads` is set to `{spursThreads}`; please change it back to `6`");
else
notes.Add($"ℹ `Max SPURS Threads` is set to `{spursThreads}`; may result in game crash");
}
if (items["gpu_texture_scaling"] is string gpuTextureScaling && gpuTextureScaling == EnabledMark)
notes.Add("⚠ `GPU Texture Scaling` is enabled, please disable");
if (items["af_override"] is string af)