From aa01f70f469a7c0c559689e958e73125dad147b9 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Wed, 29 Jan 2025 17:56:43 -0600
Subject: [PATCH] =?UTF-8?q?UI:=20Pretty=20Atmosph=C3=A8re=20mod=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Ryujinx/UI/Models/ModModel.cs                   |  7 ++++++-
 src/Ryujinx/UI/Windows/ModManagerWindow.axaml       |  2 +-
 .../Utilities/AppLibrary/ApplicationLibrary.cs      | 13 +++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx/UI/Models/ModModel.cs b/src/Ryujinx/UI/Models/ModModel.cs
index ee28ca5f5..a713f8e36 100644
--- a/src/Ryujinx/UI/Models/ModModel.cs
+++ b/src/Ryujinx/UI/Models/ModModel.cs
@@ -1,5 +1,5 @@
 using Ryujinx.Ava.UI.ViewModels;
-using System.IO;
+using System.Globalization;
 
 namespace Ryujinx.Ava.UI.Models
 {
@@ -21,6 +21,11 @@ namespace Ryujinx.Ava.UI.Models
         public string Path { get; }
         public string Name { get; }
 
+        public string FormattedName => 
+            InSd && ulong.TryParse(Name, NumberStyles.HexNumber, null, out ulong applicationId)
+                ? $"Atmosphère: {System.IO.Path.GetFileNameWithoutExtension(RyujinxApp.MainWindow.ApplicationLibrary.GetNameForApplicationId(applicationId))}"
+                : Name;
+
         public ModModel(string path, string name, bool enabled, bool inSd)
         {
             Path = path;
diff --git a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
index a8fd3a2e7..b50ea2c8e 100644
--- a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
@@ -81,7 +81,7 @@
                                     MaxLines="2"
                                     TextWrapping="Wrap"
                                     TextTrimming="CharacterEllipsis"
-                                    Text="{Binding Name}" />
+                                    Text="{Binding FormattedName}" />
                                 <StackPanel
                                     Grid.Column="1"
                                     Spacing="10"
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
index 7577b9f74..79388958a 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -111,6 +111,19 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             return data;
         }
 
+        public string GetNameForApplicationId(ulong id)
+        {
+            DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
+            if (appData.HasValue)
+                return appData.Value.Name;
+
+            Gommon.Optional<DownloadableContentModel> dlcData = DownloadableContents.Keys.FindFirst(x => x.TitleId == id);
+            if (dlcData.HasValue)
+                return dlcData.Value.FileName;
+
+            return id.ToString("X16");
+        }
+
         /// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
         /// <exception cref="InvalidDataException">The NCA header could not be decrypted.</exception>
         /// <exception cref="NotSupportedException">The NCA version is not supported.</exception>