mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2025-04-15 19:04:06 -05:00
623604c391
* Fixed formatting/parsing issues with ApplicationData properties TimePlayed, LastPlayed, and FileSize Replaced double-based TimePlayed property with TimeSpan?-based one in ApplicationData and ApplicationMetadata Added a migration for TimePlayed, just like in #4861 Consolidated ApplicationData's FileSize* properties into one FileSize property Added a formatting/parsing helper class ValueFormatUtils for TimeSpans, DateTimes, and file sizes Added new value converters for TimeSpans and file sizes for the Avalonia UI Added TimePlayedSortComparer Fixed sort order in LastPlayedSortComparer Fixed sort order for ApplicationData fields TimePlayed, LastPlayed, and FileSize Fixed crashes caused by SortHelper Replaced SystemInfo.ToMiBString with ToGiBString backed by ValueFormatUtils Replaced SaveModel.GetSizeString() with ValueFormatUtils * Additional ApplicationLibrary changes that got lost in the last commit * Removed unneeded usings * Removed converters as they are no longer needed * Updated comment on FormatDateTime * Removed base10 parameter from ValueFormatUtils FormatFileSize now always returns base 2 values with base 10 units Made ParseFileSize capable of parsing both base 2 and base 10 units * Removed nullable attribute from TimePlayed property Centralized TimePlayed update code into ApplicationMetadata * Changed UpdateTimePlayed() to use TimeSpan logic * Removed JsonIgnore attributes from ApplicationData * Implemented requested format changes * Fixed mistakes in method documentation comments * Made it so the Last Played value "Never" is localized in the Avalonia UI * Implemented suggestions * Remove unused import * Did a comment refinement pass in ValueFormatUtils.cs * Reordered ValueFormatUtils methods and sorted them into #regions * Integrated functionality from #5056 Also removed Logger print from last_played migration code * Implemented suggestions * Moved ValueFormatUtils and SystemInfo to namespace Ryujinx.Ui.Common * common: Respect proper value format convention and use base10 by default This could be discuss again in another issue/PR, for now revert to the previous behavior. Signed-off-by: Mary Guillemard <mary@mary.zone> --------- Signed-off-by: Mary Guillemard <mary@mary.zone> Co-authored-by: TSR Berry <20988865+TSRBerry@users.noreply.github.com> Co-authored-by: Mary Guillemard <mary@mary.zone>
80 lines
2.7 KiB
C#
80 lines
2.7 KiB
C#
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Ui.Common.Helper;
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
using System.Runtime.Intrinsics.X86;
|
|
using System.Text;
|
|
|
|
namespace Ryujinx.Ui.Common.SystemInfo
|
|
{
|
|
public class SystemInfo
|
|
{
|
|
public string OsDescription { get; protected set; }
|
|
public string CpuName { get; protected set; }
|
|
public ulong RamTotal { get; protected set; }
|
|
public ulong RamAvailable { get; protected set; }
|
|
protected static int LogicalCoreCount => Environment.ProcessorCount;
|
|
|
|
protected SystemInfo()
|
|
{
|
|
OsDescription = $"{RuntimeInformation.OSDescription} ({RuntimeInformation.OSArchitecture})";
|
|
CpuName = "Unknown";
|
|
}
|
|
|
|
private static string ToGBString(ulong bytesValue) => (bytesValue == 0) ? "Unknown" : ValueFormatUtils.FormatFileSize((long)bytesValue, ValueFormatUtils.FileSizeUnits.Gibibytes);
|
|
|
|
public void Print()
|
|
{
|
|
Logger.Notice.Print(LogClass.Application, $"Operating System: {OsDescription}");
|
|
Logger.Notice.Print(LogClass.Application, $"CPU: {CpuName}");
|
|
Logger.Notice.Print(LogClass.Application, $"RAM: Total {ToGBString(RamTotal)} ; Available {ToGBString(RamAvailable)}");
|
|
}
|
|
|
|
public static SystemInfo Gather()
|
|
{
|
|
if (OperatingSystem.IsWindows())
|
|
{
|
|
return new WindowsSystemInfo();
|
|
}
|
|
else if (OperatingSystem.IsLinux())
|
|
{
|
|
return new LinuxSystemInfo();
|
|
}
|
|
else if (OperatingSystem.IsMacOS())
|
|
{
|
|
return new MacOSSystemInfo();
|
|
}
|
|
|
|
Logger.Error?.Print(LogClass.Application, "SystemInfo unsupported on this platform");
|
|
|
|
return new SystemInfo();
|
|
}
|
|
|
|
// x86 exposes a 48 byte ASCII "CPU brand" string via CPUID leaves 0x80000002-0x80000004.
|
|
internal static string GetCpuidCpuName()
|
|
{
|
|
if (!X86Base.IsSupported)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
// Check if CPU supports the query
|
|
if ((uint)X86Base.CpuId(unchecked((int)0x80000000), 0).Eax < 0x80000004)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
int[] regs = new int[12];
|
|
|
|
for (uint i = 0; i < 3; ++i)
|
|
{
|
|
(regs[4 * i], regs[4 * i + 1], regs[4 * i + 2], regs[4 * i + 3]) = X86Base.CpuId((int)(0x80000002 + i), 0);
|
|
}
|
|
|
|
string name = Encoding.ASCII.GetString(MemoryMarshal.Cast<int, byte>(regs)).Replace('\0', ' ').Trim();
|
|
|
|
return string.IsNullOrEmpty(name) ? null : name;
|
|
}
|
|
}
|
|
}
|