From 3311842a1636a3031aef6e21d7c5846e80445567 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Wed, 2 Jul 2025 14:49:45 -0500 Subject: [PATCH] language feature: Extension Members: More converted --- src/Ryujinx.HLE/HOS/Horizon.cs | 4 +- .../HOS/Services/Spl/IGeneralInterface.cs | 2 +- src/Ryujinx.HLE/MemoryConfiguration.cs | 42 +++++++++---------- src/Ryujinx.HLE/Switch.cs | 2 +- .../XCITrimmerFileStatusDetailConverter.cs | 8 ++-- .../XCITrimmerOperationOutcomeHelper.cs | 39 +++++++---------- .../UI/ViewModels/MainWindowViewModel.cs | 2 +- 7 files changed, 45 insertions(+), 54 deletions(-) diff --git a/src/Ryujinx.HLE/HOS/Horizon.cs b/src/Ryujinx.HLE/HOS/Horizon.cs index 5063b4329..b5091d526 100644 --- a/src/Ryujinx.HLE/HOS/Horizon.cs +++ b/src/Ryujinx.HLE/HOS/Horizon.cs @@ -121,8 +121,8 @@ namespace Ryujinx.HLE.HOS TickSource, device, device.Memory, - device.Configuration.MemoryConfiguration.ToKernelMemorySize(), - device.Configuration.MemoryConfiguration.ToKernelMemoryArrange()); + device.Configuration.MemoryConfiguration.KernelMemorySize, + device.Configuration.MemoryConfiguration.KernelMemoryArrange); Device = device; diff --git a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs index 301d415a0..6a9b4d442 100644 --- a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs +++ b/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs @@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Spl #pragma warning disable IDE0059 // Remove unnecessary value assignment SystemVersion version = context.Device.System.ContentManager.GetCurrentFirmwareVersion(); #pragma warning restore IDE0059 - MemorySize memorySize = context.Device.Configuration.MemoryConfiguration.ToKernelMemorySize(); + MemorySize memorySize = context.Device.Configuration.MemoryConfiguration.KernelMemorySize; switch (configItem) { diff --git a/src/Ryujinx.HLE/MemoryConfiguration.cs b/src/Ryujinx.HLE/MemoryConfiguration.cs index 21ecd737f..9a397098a 100644 --- a/src/Ryujinx.HLE/MemoryConfiguration.cs +++ b/src/Ryujinx.HLE/MemoryConfiguration.cs @@ -18,11 +18,11 @@ namespace Ryujinx.HLE { private const ulong GiB = 1024 * 1024 * 1024; -#pragma warning disable IDE0055 // Disable formatting - public static MemoryArrange ToKernelMemoryArrange(this MemoryConfiguration configuration) + extension(MemoryConfiguration configuration) { - return configuration switch + public MemoryArrange KernelMemoryArrange => configuration switch { +#pragma warning disable IDE0055 // Disable formatting MemoryConfiguration.MemoryConfiguration4GiB => MemoryArrange.MemoryArrange4GiB, MemoryConfiguration.MemoryConfiguration4GiBAppletDev => MemoryArrange.MemoryArrange4GiBAppletDev, MemoryConfiguration.MemoryConfiguration4GiBSystemDev => MemoryArrange.MemoryArrange4GiBSystemDev, @@ -31,38 +31,36 @@ namespace Ryujinx.HLE MemoryConfiguration.MemoryConfiguration8GiB => MemoryArrange.MemoryArrange8GiB, MemoryConfiguration.MemoryConfiguration12GiB => MemoryArrange.MemoryArrange12GiB, _ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."), +#pragma warning restore IDE0055 }; - } - - public static MemorySize ToKernelMemorySize(this MemoryConfiguration configuration) - { - return configuration switch + + public MemorySize KernelMemorySize => configuration switch { +#pragma warning disable IDE0055 // Disable formatting MemoryConfiguration.MemoryConfiguration4GiB or - MemoryConfiguration.MemoryConfiguration4GiBAppletDev or - MemoryConfiguration.MemoryConfiguration4GiBSystemDev => MemorySize.MemorySize4GiB, + MemoryConfiguration.MemoryConfiguration4GiBAppletDev or + MemoryConfiguration.MemoryConfiguration4GiBSystemDev => MemorySize.MemorySize4GiB, MemoryConfiguration.MemoryConfiguration6GiB or - MemoryConfiguration.MemoryConfiguration6GiBAppletDev => MemorySize.MemorySize6GiB, - MemoryConfiguration.MemoryConfiguration8GiB => MemorySize.MemorySize8GiB, - MemoryConfiguration.MemoryConfiguration12GiB => MemorySize.MemorySize12GiB, + MemoryConfiguration.MemoryConfiguration6GiBAppletDev => MemorySize.MemorySize6GiB, + MemoryConfiguration.MemoryConfiguration8GiB => MemorySize.MemorySize8GiB, + MemoryConfiguration.MemoryConfiguration12GiB => MemorySize.MemorySize12GiB, _ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."), +#pragma warning restore IDE0055 }; - } - - public static ulong ToDramSize(this MemoryConfiguration configuration) - { - return configuration switch + + public ulong DramSize => configuration switch { +#pragma warning disable IDE0055 // Disable formatting MemoryConfiguration.MemoryConfiguration4GiB or - MemoryConfiguration.MemoryConfiguration4GiBAppletDev or - MemoryConfiguration.MemoryConfiguration4GiBSystemDev => 4 * GiB, + MemoryConfiguration.MemoryConfiguration4GiBAppletDev or + MemoryConfiguration.MemoryConfiguration4GiBSystemDev => 4 * GiB, MemoryConfiguration.MemoryConfiguration6GiB or - MemoryConfiguration.MemoryConfiguration6GiBAppletDev => 6 * GiB, + MemoryConfiguration.MemoryConfiguration6GiBAppletDev => 6 * GiB, MemoryConfiguration.MemoryConfiguration8GiB => 8 * GiB, MemoryConfiguration.MemoryConfiguration12GiB => 12 * GiB, _ => throw new AggregateException($"Invalid memory configuration \"{configuration}\"."), +#pragma warning restore IDE0055 }; } -#pragma warning restore IDE0055 } } diff --git a/src/Ryujinx.HLE/Switch.cs b/src/Ryujinx.HLE/Switch.cs index bdcbe82c7..1c764d354 100644 --- a/src/Ryujinx.HLE/Switch.cs +++ b/src/Ryujinx.HLE/Switch.cs @@ -70,7 +70,7 @@ namespace Ryujinx.HLE #pragma warning disable IDE0055 // Disable formatting DirtyHacks = new DirtyHacks(Configuration.Hacks); AudioDeviceDriver = new CompatLayerHardwareDeviceDriver(Configuration.AudioDeviceDriver); - Memory = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags); + Memory = new MemoryBlock(Configuration.MemoryConfiguration.DramSize, memoryAllocationFlags); Gpu = new GpuContext(Configuration.GpuRenderer, DirtyHacks); System = new HOS.Horizon(this); Statistics = new PerformanceStatistics(this); diff --git a/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusDetailConverter.cs b/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusDetailConverter.cs index b83fe485d..34734661b 100644 --- a/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusDetailConverter.cs +++ b/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusDetailConverter.cs @@ -29,9 +29,11 @@ namespace Ryujinx.Ava.UI.Helpers return null; } - return app.PercentageProgress != null ? null : - app.ProcessingOutcome is not OperationOutcome.Successful and not OperationOutcome.Undetermined ? app.ProcessingOutcome.ToLocalisedText() : - null; + return app.PercentageProgress != null + ? null + : app.ProcessingOutcome is not OperationOutcome.Successful and not OperationOutcome.Undetermined + ? app.ProcessingOutcome.LocalizedText + : null; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/src/Ryujinx/UI/Helpers/XCITrimmerOperationOutcomeHelper.cs b/src/Ryujinx/UI/Helpers/XCITrimmerOperationOutcomeHelper.cs index 1a0e126c8..d58056469 100644 --- a/src/Ryujinx/UI/Helpers/XCITrimmerOperationOutcomeHelper.cs +++ b/src/Ryujinx/UI/Helpers/XCITrimmerOperationOutcomeHelper.cs @@ -5,32 +5,23 @@ namespace Ryujinx.Ava.UI.Helpers { public static class XCIFileTrimmerOperationOutcomeExtensions { - public static string ToLocalisedText(this OperationOutcome operationOutcome) + extension(OperationOutcome opOutcome) { - switch (operationOutcome) + public string LocalizedText => opOutcome switch { - case OperationOutcome.NoTrimNecessary: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileNoTrimNecessary]; - case OperationOutcome.NoUntrimPossible: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileNoUntrimPossible]; - case OperationOutcome.ReadOnlyFileCannotFix: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileReadOnlyFileCannotFix]; - case OperationOutcome.FreeSpaceCheckFailed: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileFreeSpaceCheckFailed]; - case OperationOutcome.InvalidXCIFile: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileInvalidXCIFile]; - case OperationOutcome.FileIOWriteError: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileFileIOWriteError]; - case OperationOutcome.FileSizeChanged: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileFileSizeChanged]; - case OperationOutcome.Cancelled: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileCancelled]; - case OperationOutcome.Undetermined: - return LocaleManager.Instance[LocaleKeys.TrimXCIFileFileUndertermined]; - case OperationOutcome.Successful: - default: - return null; - } + OperationOutcome.NoTrimNecessary => LocaleManager.Instance[LocaleKeys.TrimXCIFileNoTrimNecessary], + OperationOutcome.NoUntrimPossible => LocaleManager.Instance[LocaleKeys.TrimXCIFileNoUntrimPossible], + OperationOutcome.ReadOnlyFileCannotFix => LocaleManager.Instance[ + LocaleKeys.TrimXCIFileReadOnlyFileCannotFix], + OperationOutcome.FreeSpaceCheckFailed => LocaleManager.Instance[ + LocaleKeys.TrimXCIFileFreeSpaceCheckFailed], + OperationOutcome.InvalidXCIFile => LocaleManager.Instance[LocaleKeys.TrimXCIFileInvalidXCIFile], + OperationOutcome.FileIOWriteError => LocaleManager.Instance[LocaleKeys.TrimXCIFileFileIOWriteError], + OperationOutcome.FileSizeChanged => LocaleManager.Instance[LocaleKeys.TrimXCIFileFileSizeChanged], + OperationOutcome.Cancelled => LocaleManager.Instance[LocaleKeys.TrimXCIFileCancelled], + OperationOutcome.Undetermined => LocaleManager.Instance[LocaleKeys.TrimXCIFileFileUndertermined], + _ => null + }; } } } diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs index 4ca21e788..a929c855d 100644 --- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs @@ -1873,7 +1873,7 @@ namespace Ryujinx.Ava.UI.ViewModels public async void ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome) { - string notifyUser = operationOutcome.ToLocalisedText(); + string notifyUser = operationOutcome.LocalizedText; if (notifyUser != null) {