Embed compatibility list into executable

instead of downloading Co-Authored-By: Vita Chumakova <[email protected]>
Ryubing · Jan 7, 2025 · d8265f7 · d8265f7
1 parent 2595264
commit d8265f7
Show file tree

Hide file tree

Showing 6 changed files with 4,328 additions and 44 deletions.
diff --git a/docs/compatibility.csv b/docs/compatibility.csv
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
@@ -145,6 +145,9 @@
     <EmbeddedResource Include="..\..\distribution\macos\shortcut-template.plist">
       <Link>Assets\ShortcutFiles\shortcut-template.plist</Link>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\..\docs\compatibility.csv" LogicalName="RyujinxGameCompatibilityList">
+      <Link>Assets\RyujinxGameCompatibility.csv</Link>
+    </EmbeddedResource>
     <EmbeddedResource Include="Assets\locales.json" />
     <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" />

diff --git a/src/Ryujinx/UI/Helpers/MiniCommand.cs b/src/Ryujinx/UI/Helpers/MiniCommand.cs
@@ -63,6 +63,7 @@ public abstract class MiniCommand : ICommand
         public static MiniCommand Create(Action callback) => new MiniCommand<object>(_ => callback());
         public static MiniCommand Create<TArg>(Action<TArg> callback) => new MiniCommand<TArg>(callback);
         public static MiniCommand CreateFromTask(Func<Task> callback) => new MiniCommand<object>(_ => callback());
+        public static MiniCommand CreateFromTask<TArg>(Func<TArg, Task> callback) => new MiniCommand<TArg>(callback);
 
         public abstract bool CanExecute(object parameter);
         public abstract void Execute(object parameter);

diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -66,7 +66,7 @@ public MainMenuBarView()
                         WindowSize2160PMenuItem.Command = new RelayCommand<string>(ChangeWindowSize);
         }
 
-        private CheckBox[] GenerateToggleFileTypeItems() =>
+        private IEnumerable<CheckBox> GenerateToggleFileTypeItems() =>
             Enum.GetValues<FileTypes>()
                 .Select(it => (FileName: Enum.GetName(it)!, FileType: it))
                 .Select(it =>
@@ -76,15 +76,13 @@ private CheckBox[] GenerateToggleFileTypeItems() =>
                         IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
                         Command = MiniCommand.Create(() => Window.ToggleFileType(it.FileName))
                     }
-                ).ToArray();
+                );
 
-        private static MenuItem[] GenerateLanguageMenuItems()
+        private static IEnumerable<MenuItem> GenerateLanguageMenuItems()
         {
-            List<MenuItem> menuItems = new();
-
-            string localePath = "Ryujinx/Assets/locales.json";
+            const string LocalePath = "Ryujinx/Assets/locales.json";
 
-            string languageJson = EmbeddedResources.ReadAllText(localePath);
+            string languageJson = EmbeddedResources.ReadAllText(LocalePath);
 
             LocalesJson locales = JsonHelper.Deserialize(languageJson, LocalesJsonContext.Default.LocalesJson);
 
@@ -99,7 +97,10 @@ private static MenuItem[] GenerateLanguageMenuItems()
                 }
                 else
                 {
-                    languageName = locales.Locales[index].Translations[language] == "" ? language : locales.Locales[index].Translations[language];
+                    string tr = locales.Locales[index].Translations[language];
+                    languageName = string.IsNullOrEmpty(tr)
+                        ? language 
+                        : tr;
                 }
 
                 MenuItem menuItem = new()
@@ -111,10 +112,8 @@ private static MenuItem[] GenerateLanguageMenuItems()
                     Command = MiniCommand.Create(() => MainWindowViewModel.ChangeLanguage(language))
                 };
 
-                menuItems.Add(menuItem);
+                yield return menuItem;
             }
-
-            return menuItems.ToArray();
         }
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)

diff --git a/src/Ryujinx/Utilities/Compat/CompatibilityHelper.cs b/src/Ryujinx/Utilities/Compat/CompatibilityHelper.cs
diff --git a/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs b/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs
@@ -1,6 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Styling;
+using nietras.SeparatedValues;
 using Ryujinx.Ava.UI.Helpers;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Utilities.Compat
@@ -9,8 +12,15 @@ public partial class CompatibilityList : UserControl
     {
         public static async Task Show()
         {
-            await CompatibilityHelper.InitAsync();
+            if (CompatibilityCsv.Shared is null)
+            {
+                await using Stream csvStream = Assembly.GetExecutingAssembly()
+                    .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
+                csvStream.Position = 0;
 
+                CompatibilityCsv.Shared = new CompatibilityCsv(Sep.Reader().From(csvStream));
+            } 
+
             CompatibilityContentDialog contentDialog = new()
             {
                 Content = new CompatibilityList { DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary) }