Merge 6f2dce3628 into 744d813b87

docs/compatibility.csv

@@ -969,7 +969,6 @@
 0100751007ADA000,"Don't Starve: Nintendo Switch Edition",nvdec,playable,2022-02-05 20:43:34
 010088B010DD2000,"Dongo Adventure",,playable,2022-10-04 16:22:26
 0100C1F0051B6000,"Donkey Kong Country™: Tropical Freeze",,playable,2024-08-05 16:46:10
-01009D901BC56000,"Donkey Kong Country™: Returns HD",gpu,ingame,2025-02-16 13:44:12
 0100F2C00F060000,"Doodle Derby",,boots,2020-12-04 22:51:48
 0100416004C00000,"DOOM",gpu;slow;nvdec;online-broken,ingame,2024-09-23 15:40:07
 010018900DD00000,"DOOM (1993)",nvdec;online-broken,menus,2022-09-06 13:32:19

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs

@@ -101,21 +101,12 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
                 }
             }
 
-            LinuxError errno = LinuxError.SUCCESS;
+            ISocket newBsdSocket = new ManagedSocket(netDomain, (SocketType)type, protocol, context.Device.Configuration.MultiplayerLanInterfaceId)
-            ISocket newBsdSocket;
+            {
+                Blocking = !creationFlags.HasFlag(BsdSocketCreationFlags.NonBlocking),
+            };
 
-            try
+            LinuxError errno = LinuxError.SUCCESS;
-            {
-                newBsdSocket = new ManagedSocket(netDomain, (SocketType)type, protocol, context.Device.Configuration.MultiplayerLanInterfaceId)
-                {
-                    Blocking = !creationFlags.HasFlag(BsdSocketCreationFlags.NonBlocking),
-                };
-            }
-            catch (SocketException exception)
-            {
-                LinuxError errNo = WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
-                return WriteBsdResult(context, 0, errNo);
-            }
 
             int newSockFd = _context.RegisterFileDescriptor(newBsdSocket);
 
@@ -815,9 +806,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
             }
             else
             {
-                Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Invalid socket fd '{socketFd}'.");
+                Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Invalid socket fd.");
             }
-            
             return WriteBsdResult(context, 0, errno);
         }
 

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs

@@ -92,12 +92,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 newSocket = new ManagedSocket(Socket.Accept());
 
-                IPEndPoint remoteEndPoint = newSocket.RemoteEndPoint;
+                var remoteEndPoint = newSocket.RemoteEndPoint as IPEndPoint;
-                bool isPrivateIp = remoteEndPoint.Address.ToString().StartsWith("192.168.");
+                bool isLDNPrivateIP = remoteEndPoint.Address.ToString().StartsWith("192.168.");
-                Logger.Info?.PrintMsg(LogClass.ServiceBsd,
+                if (isLDNPrivateIP)
-                    isPrivateIp
+                {
-                        ? $"Accepted connection from {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}"
+                    Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Accepted connection from {ProtocolType}/{remoteEndPoint.Address}:{remoteEndPoint.Port}");
-                        : $"Accepted connection from {ProtocolType}/***:{remoteEndPoint.Port}");
+                }
+                else
+                {
+                    Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Accepted connection from {ProtocolType}/***:{remoteEndPoint.Port}");
+                }
 
                 return LinuxError.SUCCESS;
             }
@@ -107,7 +111,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
@@ -126,7 +130,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
@@ -164,7 +168,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                 {
                     if (exception.SocketErrorCode != SocketError.WouldBlock)
                     {
-                        Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                        Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                     }
                     return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
                 }
@@ -173,13 +177,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
 
         public void Disconnect()
         {
-            Logger.Info?.Print(LogClass.ServiceBsd, "Socket disconnecting");
+            Logger.Info?.Print(LogClass.ServiceBsd, $"Socket disconnecting");
             Socket.Disconnect(true);
         }
 
         public void Dispose()
         {
-            Logger.Info?.Print(LogClass.ServiceBsd, "Socket closed");
+            Logger.Info?.Print(LogClass.ServiceBsd, $"Socket closed");
             Socket.Close();
             Socket.Dispose();
         }
@@ -198,7 +202,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
@@ -221,13 +225,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
         }
 
-        private bool _hasEmittedBlockingWarning;
+        bool hasEmittedBlockingWarning = false;
 
         public LinuxError Receive(out int receiveSize, Span<byte> buffer, BsdSocketFlags flags)
         {
@@ -243,10 +247,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                     shouldBlockAfterOperation = true;
                 }
 
-                if (Blocking && !_hasEmittedBlockingWarning)
+                if (Blocking && !hasEmittedBlockingWarning)
                 {
                     Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    _hasEmittedBlockingWarning = true;
+                    hasEmittedBlockingWarning = true;
                 }
 
                 receiveSize = Socket.Receive(buffer, ConvertBsdSocketFlags(flags));
@@ -257,7 +261,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 receiveSize = -1;
 
@@ -290,10 +294,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
                     shouldBlockAfterOperation = true;
                 }
 
-                if (Blocking && !_hasEmittedBlockingWarning)
+                if (Blocking && !hasEmittedBlockingWarning)
                 {
                     Logger.Warning?.PrintMsg(LogClass.ServiceBsd, "Blocking socket operations are not yet working properly. Expect network errors.");
-                    _hasEmittedBlockingWarning = true;
+                    hasEmittedBlockingWarning = true;
                 }
 
                 if (!Socket.IsBound)
@@ -312,7 +316,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 receiveSize = -1;
 
@@ -339,7 +343,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 sendSize = -1;
 
@@ -359,7 +363,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 sendSize = -1;
 
@@ -400,7 +404,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
@@ -450,7 +454,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
@@ -586,7 +590,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }
@@ -628,7 +632,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
             {
                 if (exception.SocketErrorCode != SocketError.WouldBlock)
                 {
-                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception}");
+                    Logger.Warning?.Print(LogClass.ServiceBsd, $"Socket Exception: {exception.ToString()}");
                 }
                 return WinSockHelper.ConvertError((WsaError)exception.ErrorCode);
             }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Ava
 
         private static readonly string _description =
             ReleaseInformation.IsValid
-                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}"
+                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}@{ReleaseInformation.BuildGitHash}"
                 : "dev build";
 
         private const string ApplicationId = "1293250299716173864";
@@ -56,7 +56,6 @@ namespace Ryujinx.Ava
             ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
             TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
             HorizonStatic.PlayReport += HandlePlayReport;
-            PlayReports.Initialize();
         }
 
         private static void Update(object sender, ReactiveEventArgs<bool> evnt)

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -119,23 +119,17 @@
                         TextWrapping="Wrap" >
                     </TextBlock>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" Spacing="5" ToolTip.Tip="{Binding DynamicRichPresenceDescription}">
+                <StackPanel Orientation="Horizontal" Spacing="5">
-                    <ui:SymbolIcon 
+                    <ui:SymbolIcon Foreground="ForestGreen" Symbol="Checkmark" IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"/>
-                        Foreground="ForestGreen" 
-                        Symbol="Checkmark" 
-                        IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"/>
                     <TextBlock
                         Foreground="ForestGreen"
                         HorizontalAlignment="Stretch"
                         IsVisible="{Binding AppData.HasDynamicRichPresenceSupport}"
                         Text="{ext:Locale GameInfoRpcDynamic}"
                         TextAlignment="Start"
-                        TextWrapping="Wrap">
+                        TextWrapping="Wrap" >
                     </TextBlock>
-                    <ui:SymbolIcon 
+                    <ui:SymbolIcon Foreground="Red" Symbol="Cancel" IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"/>
-                        Foreground="Red" 
-                        Symbol="Cancel" 
-                        IsVisible="{Binding !AppData.HasDynamicRichPresenceSupport}"/>
                     <TextBlock
                         Foreground="Red"
                         HorizontalAlignment="Stretch"

src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs

@@ -1,7 +1,6 @@
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.PlayReport;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
@@ -11,11 +10,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public ApplicationDataViewModel(ApplicationData appData) => AppData = appData;
 
-        public string DynamicRichPresenceDescription =>
-            AppData.HasDynamicRichPresenceSupport
-                ? AppData.RichPresenceSpec.Value.Description
-                : GameSpec.DefaultDescription;
-
         public string FormattedVersion => LocaleManager.Instance[LocaleKeys.GameListHeaderVersion].Format(AppData.Version);
         public string FormattedDeveloper => LocaleManager.Instance[LocaleKeys.GameListHeaderDeveloper].Format(AppData.Developer);
         public string FormattedFileExtension => LocaleManager.Instance[LocaleKeys.GameListHeaderFileExtension].Format(AppData.FileExtension);

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1347,25 +1347,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             OpenHelper.OpenFolder(AppDataManager.BaseDirPath);
         }
 
-        public void OpenScreenshotsFolder()
-        {
-            string screenshotsDir = Path.Combine(AppDataManager.BaseDirPath, "screenshots");
-
-            try
-            {
-                if (!Directory.Exists(screenshotsDir))
-                    Directory.CreateDirectory(screenshotsDir);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.Print(LogClass.Application, $"Failed to create directory at path {screenshotsDir}. Error : {ex.GetType().Name}", "Screenshot");
-
-                return;
-            }
-            
-            OpenHelper.OpenFolder(screenshotsDir);
-        }
-
         public void OpenLogsFolder()
         {
             string logPath = AppDataManager.GetOrCreateLogsDir();

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -66,10 +66,6 @@
                     Command="{Binding OpenRyujinxFolder}"
                     Header="{ext:Locale MenuBarFileOpenEmuFolder}"
                     ToolTip.Tip="{ext:Locale OpenRyujinxFolderTooltip}" />
-                <MenuItem
-                    Command="{Binding OpenScreenshotsFolder}"
-                    Header="{ext:Locale MenuBarFileOpenScreenshotsFolder}"
-                    ToolTip.Tip="{ext:Locale OpenScreenshotFolderTooltip}"/>
                 <MenuItem
                     Command="{Binding OpenLogsFolder}"
                     Header="{ext:Locale MenuBarFileOpenLogsFolder}"

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -10,7 +10,6 @@ using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Utilities.Compat;
-using Ryujinx.Ava.Utilities.PlayReport;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -36,14 +35,9 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             {
                 _id = value;
 
-                Compatibility = CompatibilityCsv.Find(value);
+                Compatibility = CompatibilityCsv.Find(Id);
-                RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
-                    ? gameSpec 
-                    : default(Optional<GameSpec>);
             }
         }
-        public Optional<GameSpec> RichPresenceSpec { get; set; }
-        
         public string Developer { get; set; } = "Unknown";
         public string Version { get; set; } = "0";
         public int PlayerCount { get; set; }
@@ -52,7 +46,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public bool HasLdnGames => PlayerCount != 0 && GameCount != 0;
 
         public bool HasRichPresenceAsset => DiscordIntegrationModule.HasAssetImage(IdString);
-        public bool HasDynamicRichPresenceSupport => RichPresenceSpec.HasValue;
+        public bool HasDynamicRichPresenceSupport => DiscordIntegrationModule.HasAnalyzer(IdString);
         
         public TimeSpan TimePlayed { get; set; }
         public DateTime? LastPlayed { get; set; }

src/Ryujinx/Utilities/PlayReport/Analyzer.cs

@@ -1,6 +1,5 @@
 using Gommon;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -20,11 +19,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
 
         public IReadOnlyList<GameSpec> Specs => new ReadOnlyCollection<GameSpec>(_specs);
 
-        public GameSpec GetSpec(string titleId) => _specs.First(x => x.TitleIds.ContainsIgnoreCase(titleId));
-
-        public bool TryGetSpec(string titleId, out GameSpec gameSpec)
-            => (gameSpec = _specs.FirstOrDefault(x => x.TitleIds.ContainsIgnoreCase(titleId))) != null;
-
         /// <summary>
         /// Add an analysis spec matching a specific game by title ID, with the provided spec configuration.
         /// </summary>
@@ -33,12 +27,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
         public Analyzer AddSpec(string titleId, Func<GameSpec, GameSpec> transform)
         {
-            if (ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _))
+            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
-                return AddSpec(transform(GameSpec.Create(titleId)));
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
 
-            Logger.Notice.PrintMsg(LogClass.Application,
+            return AddSpec(transform(GameSpec.Create(titleId)));
-                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{titleId}'");
-            return this;
         }
 
         /// <summary>
@@ -49,12 +41,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
         public Analyzer AddSpec(string titleId, Action<GameSpec> transform)
         {
-            if (ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _))
+            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
-                return AddSpec(GameSpec.Create(titleId).Apply(transform));
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
 
-            Logger.Notice.PrintMsg(LogClass.Application,
+            return AddSpec(GameSpec.Create(titleId).Apply(transform));
-                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{titleId}'");
-            return this;
         }
 
         /// <summary>
@@ -67,19 +57,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             Func<GameSpec, GameSpec> transform)
         {
             string[] tids = titleIds.ToArray();
-            if (tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _) && !string.IsNullOrEmpty(x)))
+            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
-                return AddSpec(transform(GameSpec.Create(tids)));
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
 
-            Logger.Notice.PrintMsg(LogClass.Application,
+            return AddSpec(transform(GameSpec.Create(tids)));
-                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{
-                    tids.FormatCollection(
-                        x => x,
-                        separator: ", ",
-                        prefix: "[",
-                        suffix: "]"
-                    )
-                }'");
-            return this;
         }
 
         /// <summary>
@@ -91,21 +72,12 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         public Analyzer AddSpec(IEnumerable<string> titleIds, Action<GameSpec> transform)
         {
             string[] tids = titleIds.ToArray();
-            if (tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _) && !string.IsNullOrEmpty(x)))
+            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
-                return AddSpec(GameSpec.Create(tids).Apply(transform));
+                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
 
-            Logger.Notice.PrintMsg(LogClass.Application,
+            return AddSpec(GameSpec.Create(tids).Apply(transform));
-                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{
-                    tids.FormatCollection(
-                        x => x,
-                        separator: ", ",
-                        prefix: "[",
-                        suffix: "]"
-                    )
-                }'");
-            return this;
         }
-
+        
         /// <summary>
         /// Add an analysis spec matching a specific game by title ID, with the provided pre-configured spec.
         /// </summary>
@@ -133,13 +105,13 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         {
             if (!playReport.ReportData.IsDictionary)
                 return FormattedValue.Unhandled;
-            
+
-            if (!TryGetSpec(runningGameId, out GameSpec spec))
+            if (!_specs.TryGetFirst(s => runningGameId.EqualsAnyIgnoreCase(s.TitleIds), out GameSpec spec))
                 return FormattedValue.Unhandled;
 
             foreach (FormatterSpecBase formatSpec in spec.ValueFormatters.OrderBy(x => x.Priority))
             {
-                if (!formatSpec.TryFormat(appMeta, playReport, out FormattedValue value))
+                if (!formatSpec.Format(appMeta, playReport, out FormattedValue value))
                     continue;
 
                 return value;

src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs

@@ -1,5 +1,4 @@
 using Gommon;
-using Humanizer;
 using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
@@ -19,9 +18,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                 < -201d => "Exploring the Depths",
                 _ => "Roaming Hyrule"
             };
-        
-        private static FormattedValue SkywardSwordHD_Rupees(SingleValue value)
-            => "rupee".ToQuantity(value.Matched.IntValue);
 
         private static FormattedValue SuperMarioOdyssey_AssistMode(SingleValue value)
             => value.Matched.BoxedValue is 1 ? "Playing in Assist Mode" : "Playing in Regular Mode";

src/Ryujinx/Utilities/PlayReport/PlayReports.cs

@@ -1,22 +1,11 @@
-using System;
+namespace Ryujinx.Ava.Utilities.PlayReport
-
-namespace Ryujinx.Ava.Utilities.PlayReport
 {
     public static partial class PlayReports
     {
-        public static void Initialize()
+        public static Analyzer Analyzer { get; } = new Analyzer()
-        {
-            // init lazy value
-            _ = Analyzer;
-        }
-
-        public static Analyzer Analyzer => _analyzerLazy.Value;
-
-        private static readonly Lazy<Analyzer> _analyzerLazy = new(() => new Analyzer()
             .AddSpec(
                 "01007ef00011e000",
                 spec => spec
-                    .WithDescription("based on being in Master Mode.")
                     .AddValueFormatter("IsHardMode", BreathOfTheWild_MasterMode)
                     // reset to normal status when switching between normal & master mode in title screen
                     .AddValueFormatter("AoCVer", FormattedValue.SingleAlwaysResets)
@@ -24,49 +13,34 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             .AddSpec(
                 "0100f2c0115b6000",
                 spec => spec
-                    .WithDescription("based on where you are in Hyrule (Depths, Surface, Sky).")
                     .AddValueFormatter("PlayerPosY", TearsOfTheKingdom_CurrentField))
-            .AddSpec(
-                "01002da013484000",
-                spec => spec
-                    .WithDescription("based on how many Rupees you have.")
-                    .AddValueFormatter("rupees", SkywardSwordHD_Rupees))
             .AddSpec(
                 "0100000000010000",
-                spec => spec
+                spec =>
-                    .WithDescription("based on if you're playing with Assist Mode.")
+                    spec.AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
-                    .AddValueFormatter("is_kids_mode", SuperMarioOdyssey_AssistMode)
             )
             .AddSpec(
                 "010075000ecbe000",
-                spec => spec
+                spec =>
-                    .WithDescription("based on if you're playing with Assist Mode.")
+                    spec.AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
-                    .AddValueFormatter("is_kids_mode", SuperMarioOdysseyChina_AssistMode)
             )
             .AddSpec(
                 "010028600ebda000",
-                spec => spec
+                spec => spec.AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
-                    .WithDescription("based on being in either Super Mario 3D World or Bowser's Fury.")
-                    .AddValueFormatter("mode", SuperMario3DWorldOrBowsersFury)
             )
             .AddSpec( // Global & China IDs
                 ["0100152000022000", "010075100e8ec000"],
-                spec => spec
+                spec => spec.AddValueFormatter("To", MarioKart8Deluxe_Mode)
-                    .WithDescription(
-                        "based on what modes you're selecting in the menu & whether or not you're in a race.")
-                    .AddValueFormatter("To", MarioKart8Deluxe_Mode)
             )
             .AddSpec(
                 ["0100a3d008c5c000", "01008f6008c5e000"],
                 spec => spec
-                    .WithDescription("based on what area of Paldea you're exploring.")
                     .AddValueFormatter("area_no", PokemonSVArea)
                     .AddValueFormatter("team_circle", PokemonSVUnionCircle)
             )
             .AddSpec(
                 "01006a800016e000",
                 spec => spec
-                    .WithDescription("based on what mode you're playing, who won, and what characters were present.")
                     .AddSparseMultiValueFormatter(
                         [
                             // Metadata to figure out what PlayReport we have.
@@ -84,15 +58,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             )
             .AddSpec(
                 [
-                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
+                    "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000", 
-                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"
+                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"],
-                ],
+                spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
-                spec => spec
+            );
-                    .WithDescription(
-                        "based on what game you first launch.\n\nNSO emulators do not print any Play Report information past the first game launch so it's all we got.")
-                    .AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
-            )
-        );
 
         private static string Playing(string game) => $"Playing {game}";
     }

src/Ryujinx/Utilities/PlayReport/Specs.cs

@@ -23,20 +23,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
 
         public required string[] TitleIds { get; init; }
 
-        public const string DefaultDescription = "Formats the details on your Discord presence based on logged data from the game.";
-
-        private string _valueDescription;
-
-        public string Description => _valueDescription ?? DefaultDescription;
-
-        public GameSpec WithDescription(string description)
-        {
-            _valueDescription = description != null
-                ? $"Formats the details on your Discord presence {description}"
-                : null;
-            return this;
-        }
-        
         public List<FormatterSpecBase> ValueFormatters { get; } = [];
 
 
@@ -211,7 +197,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         public string[] ReportKeys { get; init; }
         public Delegate Formatter { get; init; }
 
-        public bool TryFormat(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
+        public bool Format(ApplicationMetadata appMeta, Horizon.Prepo.Types.PlayReport playReport,
             out FormattedValue formattedValue)
         {
             formattedValue = default;