Creepso/ryujinx_ryubing
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-01-11 20:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed TypedStringEnumConverter; it exists in .NET now.

Browse source 
As per the remark XMLdoc on the type: Get rid of this converter if dotnet supports similar functionality out of the box.
This commit is contained in:
GreemDev 2025-12-23 01:42:28 -06:00
parent 1e1bcb4a5b
commit a96f20dca5
23 changed files with 23 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Ryujinx.Common/Configuration/AntiAliasing.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<AntiAliasing>))]
[JsonConverter(typeof(JsonStringEnumConverter<AntiAliasing>))]
public enum AntiAliasing
{
None,

3
src/Ryujinx.Common/Configuration/AspectRatioExtensions.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<AspectRatio>))]
[JsonConverter(typeof(JsonStringEnumConverter<AspectRatio>))]
public enum AspectRatio
{
Fixed4x3,

3
src/Ryujinx.Common/Configuration/BackendThreading.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<BackendThreading>))]
[JsonConverter(typeof(JsonStringEnumConverter<BackendThreading>))]
public enum BackendThreading
{
Auto,

3
src/Ryujinx.Common/Configuration/GraphicsBackend.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<GraphicsBackend>))]
[JsonConverter(typeof(JsonStringEnumConverter<GraphicsBackend>))]
public enum GraphicsBackend
{
Vulkan,

3
src/Ryujinx.Common/Configuration/GraphicsDebugLevel.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<GraphicsDebugLevel>))]
[JsonConverter(typeof(JsonStringEnumConverter<GraphicsDebugLevel>))]
public enum GraphicsDebugLevel
{
None,

3
src/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid.Controller
{
[JsonConverter(typeof(TypedStringEnumConverter<GamepadInputId>))]
[JsonConverter(typeof(JsonStringEnumConverter<GamepadInputId>))]
public enum GamepadInputId : byte
{
Unbound,

3
src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
{
[JsonConverter(typeof(TypedStringEnumConverter<MotionInputBackendType>))]
[JsonConverter(typeof(JsonStringEnumConverter<MotionInputBackendType>))]
public enum MotionInputBackendType : byte
{
Invalid,

5
src/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
View file

@ -1,15 +1,14 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid.Controller
{
[JsonConverter(typeof(TypedStringEnumConverter<StickInputId>))]
[JsonConverter(typeof(JsonStringEnumConverter<StickInputId>))]
public enum StickInputId : byte
{
Unbound,
Left,
Right,
Count,
}
}

3
src/Ryujinx.Common/Configuration/Hid/ControllerType.cs
View file

@ -1,4 +1,3 @@
using Ryujinx.Common.Utilities;
using System;
using System.Text.Json.Serialization;
@ -6,7 +5,7 @@ namespace Ryujinx.Common.Configuration.Hid
{
// This enum was duplicated from Ryujinx.HLE.HOS.Services.Hid.PlayerIndex and should be kept identical
[Flags]
[JsonConverter(typeof(TypedStringEnumConverter<ControllerType>))]
[JsonConverter(typeof(JsonStringEnumConverter<ControllerType>))]
public enum ControllerType
{
None,

3
src/Ryujinx.Common/Configuration/Hid/InputBackendType.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid
{
[JsonConverter(typeof(TypedStringEnumConverter<InputBackendType>))]
[JsonConverter(typeof(JsonStringEnumConverter<InputBackendType>))]
public enum InputBackendType
{
Invalid,

3
src/Ryujinx.Common/Configuration/Hid/Key.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid
{
[JsonConverter(typeof(TypedStringEnumConverter<Key>))]
[JsonConverter(typeof(JsonStringEnumConverter<Key>))]
public enum Key
{
Unknown,

3
src/Ryujinx.Common/Configuration/Hid/PlayerIndex.cs
View file

@ -1,10 +1,9 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid
{
// This enum was duplicated from Ryujinx.HLE.HOS.Services.Hid.PlayerIndex and should be kept identical
[JsonConverter(typeof(TypedStringEnumConverter<PlayerIndex>))]
[JsonConverter(typeof(JsonStringEnumConverter<PlayerIndex>))]
public enum PlayerIndex
{
Player1 = 0,

3
src/Ryujinx.Common/Configuration/MemoryManagerMode.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<MemoryManagerMode>))]
[JsonConverter(typeof(JsonStringEnumConverter<MemoryManagerMode>))]
public enum MemoryManagerMode : byte
{
SoftwarePageTable,

3
src/Ryujinx.Common/Configuration/ScalingFilter.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<ScalingFilter>))]
[JsonConverter(typeof(JsonStringEnumConverter<ScalingFilter>))]
public enum ScalingFilter
{
Bilinear,

3
src/Ryujinx.Common/Logging/LogClass.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Logging
{
[JsonConverter(typeof(TypedStringEnumConverter<LogClass>))]
[JsonConverter(typeof(JsonStringEnumConverter<LogClass>))]
public enum LogClass
{
Application,

3
src/Ryujinx.Common/Logging/LogLevel.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Logging
{
[JsonConverter(typeof(TypedStringEnumConverter<LogLevel>))]
[JsonConverter(typeof(JsonStringEnumConverter<LogLevel>))]
public enum LogLevel
{
Debug,

37
src/Ryujinx.Common/Utilities/TypedStringEnumConverter.cs
View file

@ -1,37 +0,0 @@
#nullable enable
using Ryujinx.Common.Logging;
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Utilities
{
/// <summary>
/// Specifies that value of <see cref="TEnum"/> will be serialized as string in JSONs
/// </summary>
/// <remarks>
/// Trimming friendly alternative to <see cref="JsonStringEnumConverter"/>.
/// Get rid of this converter if dotnet supports similar functionality out of the box.
/// </remarks>
/// <typeparam name="TEnum">Type of enum to serialize</typeparam>
public sealed class TypedStringEnumConverter<TEnum> : JsonConverter<TEnum> where TEnum : struct, Enum
{
public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
string? enumValue = reader.GetString();
if (Enum.TryParse(enumValue, out TEnum value))
{
return value;
}
Logger.Warning?.Print(LogClass.Configuration, $"Failed to parse enum value \"{enumValue}\" for {typeof(TEnum)}, using default \"{default(TEnum)}\"");
return default;
}
public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
{
writer.WriteStringValue(value.ToString());
}
}
}

3
src/Ryujinx.HLE/HOS/Services/Account/Acc/Types/AccountState.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.HLE.HOS.Services.Account.Acc
{
[JsonConverter(typeof(TypedStringEnumConverter<AccountState>))]
[JsonConverter(typeof(JsonStringEnumConverter<AccountState>))]
public enum AccountState
{
Closed,

3
src/Ryujinx/Systems/Configuration/AudioBackend.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Ava.Systems.Configuration
{
[JsonConverter(typeof(TypedStringEnumConverter<AudioBackend>))]
[JsonConverter(typeof(JsonStringEnumConverter<AudioBackend>))]
public enum AudioBackend
{
Dummy,

3
src/Ryujinx/Systems/Configuration/System/Language.cs
View file

@ -1,10 +1,9 @@
using Ryujinx.Common.Utilities;
using Ryujinx.HLE.HOS.SystemState;
using System.Text.Json.Serialization;
namespace Ryujinx.Ava.Systems.Configuration.System
{
[JsonConverter(typeof(TypedStringEnumConverter<Language>))]
[JsonConverter(typeof(JsonStringEnumConverter<Language>))]
public enum Language
{
Japanese,

3
src/Ryujinx/Systems/Configuration/System/Region.cs
View file

@ -1,10 +1,9 @@
using Ryujinx.Common.Utilities;
using Ryujinx.HLE.HOS.SystemState;
using System.Text.Json.Serialization;
namespace Ryujinx.Ava.Systems.Configuration.System
{
[JsonConverter(typeof(TypedStringEnumConverter<Region>))]
[JsonConverter(typeof(JsonStringEnumConverter<Region>))]
public enum Region
{
Japan,

3
src/Ryujinx/Systems/Configuration/UI/FocusLostType.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Ava.Systems.Configuration.UI
{
[JsonConverter(typeof(TypedStringEnumConverter<FocusLostType>))]
[JsonConverter(typeof(JsonStringEnumConverter<FocusLostType>))]
public enum FocusLostType
{
DoNothing,

3
src/Ryujinx/Systems/Configuration/UI/UpdaterType.cs
View file

@ -1,9 +1,8 @@
using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Ava.Systems.Configuration.UI
{
[JsonConverter(typeof(TypedStringEnumConverter<UpdaterType>))]
[JsonConverter(typeof(JsonStringEnumConverter<UpdaterType>))]
public enum UpdaterType
{
Off,