From fc20d9b925b83532a19467293a7cdcbaa4ef3d6b Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Wed, 28 Jun 2023 18:41:38 +0200 Subject: [Ryujinx.Common] Address dotnet-format issues (#5358) * dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2211 warnings * Silence CA1806 and CA1834 issues * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Replace MmeShadowScratch with Array256 * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Second dotnet format pass * Fix build issues * Fix StructArrayHelpers.cs * Apply suggestions from code review Co-authored-by: Ac_K * Fix return statements * Fix naming rule violations * Update src/Ryujinx.Common/Utilities/StreamUtils.cs Co-authored-by: Ac_K * Add trailing commas * Address review feedback * Address review feedback * Rename remaining type parameters to TKey and TValue * Fix manual formatting for logging levels * Fix spacing before comments --------- Co-authored-by: Ac_K --- src/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs | 31 ++++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'src/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs') diff --git a/src/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs b/src/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs index b0c15e49..08aa452e 100644 --- a/src/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs +++ b/src/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs @@ -20,7 +20,7 @@ namespace Ryujinx.Common.SystemInfo { ["model name"] = null, ["Processor"] = null, - ["Hardware"] = null + ["Hardware"] = null, }; ParseKeyValues("/proc/cpuinfo", cpuDict); @@ -31,7 +31,7 @@ namespace Ryujinx.Common.SystemInfo var memDict = new Dictionary(StringComparer.Ordinal) { ["MemTotal"] = null, - ["MemAvailable"] = null + ["MemAvailable"] = null, }; ParseKeyValues("/proc/meminfo", memDict); @@ -56,25 +56,30 @@ namespace Ryujinx.Common.SystemInfo int count = itemDict.Count; - using (StreamReader file = new StreamReader(filePath)) + using StreamReader file = new(filePath); + + string line; + while ((line = file.ReadLine()) != null) { - string line; - while ((line = file.ReadLine()) != null) + string[] kvPair = line.Split(':', 2, StringSplitOptions.TrimEntries); + + if (kvPair.Length < 2) { - string[] kvPair = line.Split(':', 2, StringSplitOptions.TrimEntries); + continue; + } - if (kvPair.Length < 2) continue; + string key = kvPair[0]; - string key = kvPair[0]; + if (itemDict.TryGetValue(key, out string value) && value == null) + { + itemDict[key] = kvPair[1]; - if (itemDict.TryGetValue(key, out string value) && value == null) + if (--count <= 0) { - itemDict[key] = kvPair[1]; - - if (--count <= 0) break; + break; } } } } } -} \ No newline at end of file +} -- cgit v1.2.3