From 56e45ae64861b3d0b61b7e918e7c4c9aad94a0a5 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Fri, 27 Dec 2024 15:33:31 -0600
Subject: [PATCH] misc: Collapse LdnGameDataArray into the main class as an
 inner class - privated the constructor; only obtainable by the static helper
 on the main LdnGameData class. - constructor logic now in the static helper;
 constructor just directly sets the data it's given.

---
 src/Ryujinx.UI.Common/App/LdnGameData.cs      | 26 +++++++++++++++++++
 src/Ryujinx.UI.Common/App/LdnGameDataList.cs  | 24 -----------------
 .../UI/ViewModels/MainWindowViewModel.cs      |  2 +-
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs    |  9 ++++---
 4 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100644 src/Ryujinx.UI.Common/App/LdnGameDataList.cs

diff --git a/src/Ryujinx.UI.Common/App/LdnGameData.cs b/src/Ryujinx.UI.Common/App/LdnGameData.cs
index 6c784c991..f7a98e136 100644
--- a/src/Ryujinx.UI.Common/App/LdnGameData.cs
+++ b/src/Ryujinx.UI.Common/App/LdnGameData.cs
@@ -1,4 +1,7 @@
+using LibHac.Ns;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Ryujinx.UI.App.Common
 {
@@ -12,5 +15,28 @@ public struct LdnGameData
         public string Mode { get; set; }
         public string Status { get; set; }
         public IEnumerable<string> Players { get; set; }
+
+        public static Array GetArrayForApp(
+            IEnumerable<LdnGameData> receivedData, ref ApplicationControlProperty acp)
+        {
+            LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;
+
+            return new Array(receivedData.Where(game =>
+                communicationId.Items.Contains(Convert.ToUInt64(game.TitleId, 16))
+            ));
+        }
+
+        public class Array
+        {
+            private readonly LdnGameData[] _ldnDatas;
+            
+            internal Array(IEnumerable<LdnGameData> receivedData)
+            {
+                _ldnDatas = receivedData.ToArray();
+            }
+
+            public int PlayerCount => _ldnDatas.Sum(it => it.PlayerCount);
+            public int GameCount => _ldnDatas.Length;
+        }
     }
 }
diff --git a/src/Ryujinx.UI.Common/App/LdnGameDataList.cs b/src/Ryujinx.UI.Common/App/LdnGameDataList.cs
deleted file mode 100644
index d98fd081d..000000000
--- a/src/Ryujinx.UI.Common/App/LdnGameDataList.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using LibHac.Ns;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Ryujinx.UI.App.Common
-{
-    public class LdnGameDataArray
-    {
-        private readonly LdnGameData[] _ldnDatas;
-
-        public LdnGameDataArray(IEnumerable<LdnGameData> receivedData, ref ApplicationControlProperty acp)
-        {
-            LibHac.Common.FixedArrays.Array8<ulong> communicationId = acp.LocalCommunicationId;
-
-            _ldnDatas = receivedData.Where(game =>
-                communicationId.Items.Contains(Convert.ToUInt64(game.TitleId, 16))
-            ).ToArray();
-        }
-
-        public int PlayerCount => _ldnDatas.Sum(it => it.PlayerCount);
-        public int GameCount => _ldnDatas.Length;
-    }
-}
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 39799c117..2f1800290 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -127,7 +127,7 @@ public class MainWindowViewModel : BaseModel
         public ApplicationData GridSelectedApplication;
         
         // Key is Title ID
-        public SafeDictionary<string, LdnGameDataArray> LdnData = [];
+        public SafeDictionary<string, LdnGameData.Array> LdnData = [];
 
         // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
         // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 832674541..da4314e79 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -171,9 +171,12 @@ private void ApplicationLibrary_LdnGameDataReceived(object sender, LdnGameDataRe
                 ViewModel.LdnData.Clear();
                 foreach (var application in ViewModel.Applications)
                 {
-                    ViewModel.LdnData[application.IdString] = new LdnGameDataArray(
-                        ldnGameDataArray,
-                        ref application.ControlHolder.Value
+                    ref var controlHolder = ref application.ControlHolder.Value;
+                    
+                    ViewModel.LdnData[application.IdString] = 
+                        LdnGameData.GetArrayForApp(
+                            ldnGameDataArray, 
+                            ref controlHolder
                         );
                     
                     UpdateApplicationWithLdnData(application);