Merge branch 'master' into master

src/Ryujinx/DiscordIntegrationModule.cs

@@ -56,6 +56,7 @@ 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/Utilities/PlayReport/Analyzer.cs

@@ -1,5 +1,6 @@
 using Gommon;
 using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -27,10 +28,12 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
         public Analyzer AddSpec(string titleId, Func<GameSpec, GameSpec> transform)
         {
-            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
+            if (ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _))
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
                 return AddSpec(transform(GameSpec.Create(titleId)));
+
+            Logger.Notice.PrintMsg(LogClass.Application,
+                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{titleId}'");
+            return this;
         }
 
         /// <summary>
@@ -41,10 +44,12 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// <returns>The current <see cref="Analyzer"/>, for chaining convenience.</returns>
         public Analyzer AddSpec(string titleId, Action<GameSpec> transform)
         {
-            Guard.Ensure(ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _),
+            if (ulong.TryParse(titleId, NumberStyles.HexNumber, null, out _))
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
                 return AddSpec(GameSpec.Create(titleId).Apply(transform));
+
+            Logger.Notice.PrintMsg(LogClass.Application,
+                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{titleId}'");
+            return this;
         }
 
         /// <summary>
@@ -57,10 +62,19 @@ namespace Ryujinx.Ava.Utilities.PlayReport
             Func<GameSpec, GameSpec> transform)
         {
             string[] tids = titleIds.ToArray();
-            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
+            if (tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _) && !string.IsNullOrEmpty(x)))
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
                 return AddSpec(transform(GameSpec.Create(tids)));
+
+            Logger.Notice.PrintMsg(LogClass.Application,
+                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{
+                    tids.FormatCollection(
+                        x => x,
+                        separator: ", ",
+                        prefix: "[",
+                        suffix: "]"
+                    )
+                }'");
+            return this;
         }
 
         /// <summary>
@@ -72,10 +86,19 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         public Analyzer AddSpec(IEnumerable<string> titleIds, Action<GameSpec> transform)
         {
             string[] tids = titleIds.ToArray();
-            Guard.Ensure(tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _)),
+            if (tids.All(x => ulong.TryParse(x, NumberStyles.HexNumber, null, out _) && !string.IsNullOrEmpty(x)))
-                $"Cannot use a non-hexadecimal string as the Title ID for a {nameof(GameSpec)}.");
-
                 return AddSpec(GameSpec.Create(tids).Apply(transform));
+
+            Logger.Notice.PrintMsg(LogClass.Application,
+                $"Tried to add a {nameof(GameSpec)} with a non-hexadecimal title ID value. Input: '{
+                    tids.FormatCollection(
+                        x => x,
+                        separator: ", ",
+                        prefix: "[",
+                        suffix: "]"
+                    )
+                }'");
+            return this;
         }
 
         /// <summary>

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

@@ -1,4 +1,5 @@
 using Gommon;
+using Humanizer;
 using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
@@ -19,6 +20,9 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                 _ => "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,8 +1,19 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
+using System;
+
+namespace Ryujinx.Ava.Utilities.PlayReport
 {
     public static partial class PlayReports
     {
-        public static Analyzer Analyzer { get; } = new Analyzer()
+        public static void Initialize()
+        {
+            // init lazy value
+            _ = Analyzer;
+        }
+        
+        public static Analyzer Analyzer => _analyzerLazy.Value;
+
+        private static readonly Lazy<Analyzer> _analyzerLazy = new(() =>
+            new Analyzer()
                 .AddSpec(
                     "01007ef00011e000",
                     spec => spec
@@ -59,8 +70,11 @@
                 .AddSpec(
                     [
                         "0100c9a00ece6000", "01008d300c50c000", "0100d870045b6000",
-                    "010012f017576000", "0100c62011050000", "0100b3c014bda000"],
+                        "010012f017576000", "0100c62011050000", "0100b3c014bda000"
+                    ],
                     spec => spec.AddValueFormatter("launch_title_id", NsoEmulator_LaunchedGame)
+                )
+                .AddSpec("01002da013484000", spec => spec.AddValueFormatter("rupees", SkywardSwordHD_Rupees))
         );
 
         private static string Playing(string game) => $"Playing {game}";