UI: Create a ColumnIndices struct and pass it by reference to the row ctor instead of recomputing the column index for every column on every row

The entries were matched with the game database from
https://github.com/blawar/titledb/blob/master/US.en.json, allowing to
fill missing title IDs and fix game names.

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -1,52 +1,71 @@
 using Gommon;
 using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 
 namespace Ryujinx.Ava.Utilities.Compat
 {
+    public struct ColumnIndices(SepReaderHeader header)
+    {
+        public const string TitleIdCol = "\"title_id\"";
+        public const string GameNameCol = "\"game_name\"";
+        public const string LabelsCol = "\"labels\"";
+        public const string StatusCol = "\"status\"";
+        public const string LastUpdatedCol = "\"last_updated\"";
+        
+        public readonly int TitleId = header.IndexOf(TitleIdCol);
+        public readonly int GameName = header.IndexOf(GameNameCol);
+        public readonly int Labels = header.IndexOf(LabelsCol);
+        public readonly int Status = header.IndexOf(StatusCol);
+        public readonly int LastUpdated = header.IndexOf(LastUpdatedCol);
+    }
+    
     public class CompatibilityCsv
     {
-        public static CompatibilityCsv Shared { get; set; }
-        
-        public CompatibilityCsv(SepReader reader)
+        static CompatibilityCsv()
         {
-            var entries = new List<CompatibilityEntry>();
+            using Stream csvStream = Assembly.GetExecutingAssembly()
+                .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
+            csvStream.Position = 0;
 
-            foreach (var row in reader)
-            {
-                entries.Add(new CompatibilityEntry(reader.Header, row));
-            }
-
-            Entries = entries.Where(x => x.Status != null)
-                .OrderBy(it => it.GameName).ToArray();
+            LoadFromStream(csvStream);
         }
         
-        public CompatibilityEntry[] Entries { get; }
+        public static void LoadFromStream(Stream stream)
+        {
+            var reader = Sep.Reader().From(stream);
+            var columnIndices = new ColumnIndices(reader.Header); 
+
+            Entries = reader
+                .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
+                .OrderBy(it => it.GameName)
+                .ToArray();
+            
+            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.");
+        }
+
+        public static CompatibilityEntry[] Entries { get; private set; }
     }
 
     public class CompatibilityEntry
     {
-        public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
+        public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row)
         {
-            IssueNumber = row[header.IndexOf("issue_number")].Parse<int>();
-
-            var titleIdRow = row[header.IndexOf("extracted_game_id")].ToString();
+            var titleIdRow = ColStr(row[indices.TitleId]);
             TitleId = !string.IsNullOrEmpty(titleIdRow) 
                 ? titleIdRow 
                 : default(Optional<string>);
             
-            var issueTitleRow = row[header.IndexOf("issue_title")].ToString();
-            if (TitleId.HasValue)
-                issueTitleRow = issueTitleRow.ReplaceIgnoreCase($" - {TitleId}", string.Empty);
+            GameName = ColStr(row[indices.GameName]).Trim().Trim('"');
 
-            GameName = issueTitleRow.Trim().Trim('"');
-
-            IssueLabels = row[header.IndexOf("issue_labels")].ToString().Split(';');
-            Status = row[header.IndexOf("extracted_status")].ToString().ToLower() switch
+            Labels = ColStr(row[indices.Labels]).Split(';');
+            Status = ColStr(row[indices.Status]).ToLower() switch
             {
                 "playable" => LocaleKeys.CompatibilityListPlayable,
                 "ingame" => LocaleKeys.CompatibilityListIngame,
@@ -56,25 +75,25 @@ namespace Ryujinx.Ava.Utilities.Compat
                 _ => null
             };
 
-            if (row[header.IndexOf("last_event_date")].TryParse<DateTime>(out var dt))
-                LastEvent = dt;
+            if (DateTime.TryParse(ColStr(row[indices.LastUpdated]), out var dt))
+                LastUpdated = dt;
 
-            if (row[header.IndexOf("events_count")].TryParse<int>(out var eventsCount))
-                EventCount = eventsCount;
+            return;
+            
+            string ColStr(SepReader.Col col) => col.ToString().Trim('"');
         }
         
-        public int IssueNumber { get; }
         public string GameName { get; }
         public Optional<string> TitleId { get; }
-        public string[] IssueLabels { get; }
+        public string[] Labels { get; }
         public LocaleKeys? Status { get; }
-        public DateTime LastEvent { get; }
-        public int EventCount { get; }
+        public DateTime LastUpdated { get; }
 
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
-        public string FormattedTitleId => TitleId.OrElse(new string(' ', 16));
+        public string FormattedTitleId => TitleId
+            .OrElse(new string(' ', 16));
 
-        public string FormattedIssueLabels => IssueLabels
+        public string FormattedIssueLabels => Labels
             .Where(it => !it.StartsWithIgnoreCase("status"))
             .Select(FormatLabelName)
             .JoinToString(", ");
@@ -82,13 +101,11 @@ namespace Ryujinx.Ava.Utilities.Compat
         public override string ToString()
         {
             var sb = new StringBuilder("CompatibilityEntry: {");
-            sb.Append($"{nameof(IssueNumber)}={IssueNumber}, ");
             sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
             sb.Append($"{nameof(TitleId)}={TitleId}, ");
-            sb.Append($"{nameof(IssueLabels)}=\"{IssueLabels}\", ");
+            sb.Append($"{nameof(Labels)}=\"{Labels}\", ");
             sb.Append($"{nameof(Status)}=\"{Status}\", ");
-            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\", ");
-            sb.Append($"{nameof(EventCount)}={EventCount}");
+            sb.Append($"{nameof(LastUpdated)}=\"{LastUpdated}\"");
             sb.Append('}');
 
             return sb.ToString();

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -47,9 +47,8 @@
                             <Grid Width="750" ColumnDefinitions="Auto,Auto,Auto,*"
                                   Margin="5">
                                 <TextBlock Grid.Column="0"
-                                           FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding GameName}"
-                                           Width="333"
+                                           Width="320"
                                            TextWrapping="Wrap" />
                                 <TextBlock Grid.Column="1"
                                            Width="135"
@@ -60,14 +59,12 @@
                                 <TextBlock Grid.Column="2"
                                            Padding="7, 0"
                                            VerticalAlignment="Center"
-                                           FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding LocalizedStatus}"
                                            Width="85"
                                            Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
                                            TextWrapping="NoWrap" />
                                 <TextBlock Grid.Column="3"
                                            VerticalAlignment="Center"
-                                           FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding FormattedIssueLabels}"
                                            TextWrapping="WrapWithOverflow" />
                             </Grid>

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -14,15 +14,6 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public static async Task Show()
         {
-            if (CompatibilityCsv.Shared is null)
-            {
-                await using Stream csvStream = Assembly.GetExecutingAssembly()
-                    .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
-                csvStream.Position = 0;
-
-                CompatibilityCsv.Shared = new CompatibilityCsv(Sep.Reader().From(csvStream));
-            }
-            
             ContentDialog contentDialog = new()
             {
                 PrimaryButtonText = string.Empty,

src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs

@@ -11,14 +11,13 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         [ObservableProperty] private bool _onlyShowOwnedGames = true;
 
-        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Shared.Entries;
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
         private readonly string[] _ownedGameTitleIds = [];
         private readonly ApplicationLibrary _appLibrary;
 
         public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
             ? _currentEntries.Where(x =>
-                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid))
-                || _appLibrary.Applications.Items.Any(a => a.Name.EqualsIgnoreCase(x.GameName)))
+                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid)))
             : _currentEntries;
 
         public CompatibilityViewModel() {}
@@ -39,11 +38,11 @@ namespace Ryujinx.Ava.Utilities.Compat
         {
             if (string.IsNullOrEmpty(searchTerm))
             {
-                SetEntries(CompatibilityCsv.Shared.Entries);
+                SetEntries(CompatibilityCsv.Entries);
                 return;
             }
 
-            SetEntries(CompatibilityCsv.Shared.Entries.Where(x =>
+            SetEntries(CompatibilityCsv.Entries.Where(x =>
                 x.GameName.ContainsIgnoreCase(searchTerm)
                 || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
         }