emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

common: Fix last warning in SystemInfo (#1757)

Browse source 
* common: Fix last warning in SystemInfo

* info to Info

* fix MacOSSystemInfo file name by delete the file

* MacOSSysteminfo to MacOSSystemInfo
This commit is contained in:
Ac_K 2020-12-01 22:26:00 +01:00 committed by GitHub
parent a04a1b663d
commit 5e6dc37aed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
View file

@ -5,12 +5,12 @@ using System.Runtime.Versioning;
namespace Ryujinx.Common.SystemInfo namespace Ryujinx.Common.SystemInfo
{ {
[SupportedOSPlatform("linux")] [SupportedOSPlatform("linux")]
internal class LinuxSysteminfo : SystemInfo internal class LinuxSystemInfo : SystemInfo
{ {
public override string CpuName { get; } public override string CpuName { get; }
public override ulong RamSize { 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(); 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; RamSize = ulong.Parse(File.ReadAllLines("/proc/meminfo")[0].Split(":")[1].Trim().Split(" ")[0]) * 1024;

4
Ryujinx.Common/SystemInfo/MacOSSysteminfo.cs → Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
View file

@ -8,7 +8,7 @@ using Ryujinx.Common.Logging;
namespace Ryujinx.Common.SystemInfo namespace Ryujinx.Common.SystemInfo
{ {
[SupportedOSPlatform("macos")] [SupportedOSPlatform("macos")]
internal class MacOSSysteminfo : SystemInfo internal class MacOSSystemInfo : SystemInfo
{ {
public override string CpuName { get; } public override string CpuName { get; }
public override ulong RamSize { get; } public override ulong RamSize { get; }
@ -65,7 +65,7 @@ namespace Ryujinx.Common.SystemInfo
return res; return res;
} }
public MacOSSysteminfo() public MacOSSystemInfo()
{ {
ulong ramSize = 0; ulong ramSize = 0;

29
Ryujinx.Common/SystemInfo/SystemInfo.cs
View file

@ -1,4 +1,5 @@
using System.Runtime.InteropServices; using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Common.SystemInfo namespace Ryujinx.Common.SystemInfo
{ {
@ -7,35 +8,23 @@ namespace Ryujinx.Common.SystemInfo
public virtual string OsDescription => $"{RuntimeInformation.OSDescription} ({RuntimeInformation.OSArchitecture})"; public virtual string OsDescription => $"{RuntimeInformation.OSDescription} ({RuntimeInformation.OSArchitecture})";
public virtual string CpuName => "Unknown"; public virtual string CpuName => "Unknown";
public virtual ulong RamSize => 0; public virtual ulong RamSize => 0;
public string RamSizeInMB => (RamSize == 0) ? "Unknown" : $"{RamSize / 1024 / 1024} MB";
public string RamSizeInMB
{
get
{
if (RamSize == 0)
{
return "Unknown";
}
return $"{RamSize / 1024 / 1024} MB";
}
}
public static SystemInfo Instance { get; } public static SystemInfo Instance { get; }
static SystemInfo() 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 else
{ {

4
Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
View file

@ -7,12 +7,12 @@ using System.Runtime.Versioning;
namespace Ryujinx.Common.SystemInfo namespace Ryujinx.Common.SystemInfo
{ {
[SupportedOSPlatform("windows")] [SupportedOSPlatform("windows")]
internal class WindowsSysteminfo : SystemInfo internal class WindowsSystemInfo : SystemInfo
{ {
public override string CpuName { get; } public override string CpuName { get; }
public override ulong RamSize { get; } public override ulong RamSize { get; }
public WindowsSysteminfo() public WindowsSystemInfo()
{ {
bool wmiNotAvailable = false; bool wmiNotAvailable = false;