From 5e6dc37aed22bd596db6a0e9c9a0527fc2a8e5b5 Mon Sep 17 00:00:00 2001
From: Ac_K <Acoustik666@gmail.com>
Date: Tue, 1 Dec 2020 22:26:00 +0100
Subject: [PATCH] common: Fix last warning in SystemInfo (#1757)

* common: Fix last warning in SystemInfo

* info to Info

* fix MacOSSystemInfo file name by delete the file

* MacOSSysteminfo to MacOSSystemInfo
---
 Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs  |  4 +--
 ...{MacOSSysteminfo.cs => MacOSSystemInfo.cs} |  4 +--
 Ryujinx.Common/SystemInfo/SystemInfo.cs       | 29 ++++++-------------
 .../SystemInfo/WindowsSystemInfo.cs           |  4 +--
 4 files changed, 15 insertions(+), 26 deletions(-)
 rename Ryujinx.Common/SystemInfo/{MacOSSysteminfo.cs => MacOSSystemInfo.cs} (97%)

diff --git a/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs b/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
index c729ab3da4..f067083e47 100644
--- a/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Common.SystemInfo
 {
     [SupportedOSPlatform("linux")]
-    internal class LinuxSysteminfo : SystemInfo
+    internal class LinuxSystemInfo : SystemInfo
     {
         public override string CpuName { get; }
         public override ulong RamSize { get; }
 
-        public LinuxSysteminfo()
+        public LinuxSystemInfo()
         {
             CpuName = File.ReadAllLines("/proc/cpuinfo").Where(line => line.StartsWith("model name")).ToList()[0].Split(":")[1].Trim();
             RamSize = ulong.Parse(File.ReadAllLines("/proc/meminfo")[0].Split(":")[1].Trim().Split(" ")[0]) * 1024;
diff --git a/Ryujinx.Common/SystemInfo/MacOSSysteminfo.cs b/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
similarity index 97%
rename from Ryujinx.Common/SystemInfo/MacOSSysteminfo.cs
rename to Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
index 1cf18ca0f7..ec069ca427 100644
--- a/Ryujinx.Common/SystemInfo/MacOSSysteminfo.cs
+++ b/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
@@ -8,7 +8,7 @@ using Ryujinx.Common.Logging;
 namespace Ryujinx.Common.SystemInfo
 {
     [SupportedOSPlatform("macos")]
-    internal class MacOSSysteminfo : SystemInfo
+    internal class MacOSSystemInfo : SystemInfo
     {
         public override string CpuName { get; }
         public override ulong RamSize { get; }
@@ -65,7 +65,7 @@ namespace Ryujinx.Common.SystemInfo
             return res;
         }
 
-        public MacOSSysteminfo()
+        public MacOSSystemInfo()
         {
             ulong ramSize = 0;
 
diff --git a/Ryujinx.Common/SystemInfo/SystemInfo.cs b/Ryujinx.Common/SystemInfo/SystemInfo.cs
index 9ab1419c8a..feb6b8f8a8 100644
--- a/Ryujinx.Common/SystemInfo/SystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/SystemInfo.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using System;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Common.SystemInfo
 {
@@ -7,35 +8,23 @@ namespace Ryujinx.Common.SystemInfo
         public virtual string OsDescription => $"{RuntimeInformation.OSDescription} ({RuntimeInformation.OSArchitecture})";
         public virtual string CpuName => "Unknown";
         public virtual ulong RamSize => 0;
-
-        public string RamSizeInMB
-        {
-            get
-            {
-                if (RamSize == 0)
-                {
-                    return "Unknown";
-                }
-
-                return $"{RamSize / 1024 / 1024} MB";
-            }
-        }
+        public string RamSizeInMB => (RamSize == 0) ? "Unknown" : $"{RamSize / 1024 / 1024} MB";
 
         public static SystemInfo Instance { get; }
 
         static SystemInfo()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
-                Instance = new WindowsSysteminfo();
+                Instance = new WindowsSystemInfo();
             }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            else if (OperatingSystem.IsLinux())
             {
-                Instance = new LinuxSysteminfo();
+                Instance = new LinuxSystemInfo();
             }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            else if (OperatingSystem.IsMacOS())
             {
-                Instance = new MacOSSysteminfo();
+                Instance = new MacOSSystemInfo();
             }
             else
             {
diff --git a/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs b/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
index 1b048c8ebb..479dd25fef 100644
--- a/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
@@ -7,12 +7,12 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Common.SystemInfo
 {
     [SupportedOSPlatform("windows")]
-    internal class WindowsSysteminfo : SystemInfo
+    internal class WindowsSystemInfo : SystemInfo
     {
         public override string CpuName { get; }
         public override ulong RamSize { get; }
 
-        public WindowsSysteminfo()
+        public WindowsSystemInfo()
         {
             bool wmiNotAvailable = false;