Merge branch 'master' into threading

src/Ryujinx/UI/Helpers/PlayabilityStatusConverter.cs

@@ -12,8 +12,8 @@ namespace Ryujinx.Ava.UI.Helpers
         private static readonly Lazy<PlayabilityStatusConverter> _shared = new(() => new());
         public static PlayabilityStatusConverter Shared => _shared.Value;
 
-        public object Convert(object? value, Type _, object? __, CultureInfo ___) =>
+        public object Convert(object value, Type _, object __, CultureInfo ___)
-            value.Cast<LocaleKeys>() switch
+            => value.Cast<LocaleKeys>() switch
             {
                 LocaleKeys.CompatibilityListNothing or 
                     LocaleKeys.CompatibilityListBoots or 
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 _ => Brushes.ForestGreen
             };
 
-        public object ConvertBack(object? value, Type _, object? __, CultureInfo ___) 
+        public object ConvertBack(object value, Type _, object __, CultureInfo ___)
             => throw new NotSupportedException();
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -741,7 +741,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
-                .Bind(out _appsObservableList).AsObservableList();
+#pragma warning disable MVVMTK0034
+                .Bind(out _appsObservableList)
+#pragma warning enable MVVMTK0034
+                .AsObservableList();
 
             OnPropertyChanged(nameof(AppsObservableList));
         }

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -32,29 +32,27 @@ namespace Ryujinx.Ava.Utilities
 
         public string GetContentPath(ContentManager contentManager)
             => (contentManager ?? _contentManager)
-                .GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
+                ?.GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
 
         public bool CanStart(ContentManager contentManager, out ApplicationData appData,
             out BlitStruct<ApplicationControlProperty> appControl)
         {
             contentManager ??= _contentManager;
             if (contentManager == null) 
-            {
+                goto BadData;
+
+            string contentPath = GetContentPath(contentManager);
+            if (string.IsNullOrEmpty(contentPath)) 
+                goto BadData;
+
+            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
+            appControl = StructHelpers.CreateCustomNacpData(Name, Version);
+            return true;
+            
+        BadData:
             appData = null;
             appControl = new BlitStruct<ApplicationControlProperty>(0);
             return false;
         }
-
-            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
-
-            if (string.IsNullOrEmpty(appData.Path))
-            {
-                appControl = new BlitStruct<ApplicationControlProperty>(0);
-                return false;
-            }
-
-            appControl = StructHelpers.CreateCustomNacpData(Name, Version);
-            return true;
-        }
     }
 }

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -1,50 +1,65 @@
 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(Func<ReadOnlySpan<char>, int> getIndex)
+    {
+        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 = getIndex(TitleIdCol);
+        public readonly int GameName = getIndex(GameNameCol);
+        public readonly int Labels = getIndex(LabelsCol);
+        public readonly int Status = getIndex(StatusCol);
+        public readonly int LastUpdated = getIndex(LastUpdatedCol);
+    }
+    
     public class CompatibilityCsv
     {
-        public static CompatibilityCsv Shared { get; set; }
+        static CompatibilityCsv()
-        
-        public CompatibilityCsv(SepReader reader)
         {
-            var entries = new List<CompatibilityEntry>();
+            using Stream csvStream = Assembly.GetExecutingAssembly()
+                .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
+            csvStream.Position = 0;
 
-            foreach (var row in reader)
+            using SepReader reader = Sep.Reader().From(csvStream);
-            {
+            ColumnIndices columnIndices = new(reader.Header.IndexOf);
-                entries.Add(new CompatibilityEntry(reader.Header, row));
+
+            Entries = reader
+                .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
+                .OrderBy(it => it.GameName)
+                .ToArray();
+            
+            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatCsv");
         }
 
-            Entries = entries.Where(x => x.Status != null)
+        public static CompatibilityEntry[] Entries { get; private set; }
-                .OrderBy(it => it.GameName).ToArray();
-        }
-
-        public CompatibilityEntry[] Entries { get; }
     }
 
     public class CompatibilityEntry
     {
-        public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
+        public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row)
         {
-            if (row.ColCount != header.ColNames.Count)
+            string titleIdRow = ColStr(row[indices.TitleId]);
-                throw new InvalidDataException($"CSV row {row.RowIndex} ({row.ToString()}) has mismatched column count");
-            
-            var titleIdRow = ColStr(row[header.IndexOf("\"title_id\"")]);
             TitleId = !string.IsNullOrEmpty(titleIdRow) 
                 ? titleIdRow 
                 : default(Optional<string>);
             
-            GameName = ColStr(row[header.IndexOf("\"game_name\"")]).Trim().Trim('"');
+            GameName = ColStr(row[indices.GameName]).Trim().Trim('"');
 
-            IssueLabels = ColStr(row[header.IndexOf("\"labels\"")]).Split(';');
+            Labels = ColStr(row[indices.Labels]).Split(';');
-            Status = ColStr(row[header.IndexOf("\"status\"")]).ToLower() switch
+            Status = ColStr(row[indices.Status]).ToLower() switch
             {
                 "playable" => LocaleKeys.CompatibilityListPlayable,
                 "ingame" => LocaleKeys.CompatibilityListIngame,
@@ -54,8 +69,8 @@ namespace Ryujinx.Ava.Utilities.Compat
                 _ => null
             };
 
-            if (DateTime.TryParse(ColStr(row[header.IndexOf("\"last_updated\"")]), out var dt))
+            if (DateTime.TryParse(ColStr(row[indices.LastUpdated]), out var dt))
-                LastEvent = dt;
+                LastUpdated = dt;
 
             return;
             
@@ -64,27 +79,27 @@ namespace Ryujinx.Ava.Utilities.Compat
         
         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 DateTime LastUpdated { get; }
 
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
         public string FormattedTitleId => TitleId
             .OrElse(new string(' ', 16));
 
-        public string FormattedIssueLabels => IssueLabels
+        public string FormattedIssueLabels => Labels
             .Where(it => !it.StartsWithIgnoreCase("status"))
             .Select(FormatLabelName)
             .JoinToString(", ");
 
         public override string ToString()
         {
-            var sb = new StringBuilder("CompatibilityEntry: {");
+            StringBuilder sb = new("CompatibilityEntry: {");
             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(LastUpdated)}=\"{LastUpdated}\"");
             sb.Append('}');
 
             return sb.ToString();
@@ -140,8 +155,8 @@ namespace Ryujinx.Ava.Utilities.Compat
             if (value == string.Empty)
                 return string.Empty;
         
-            var firstChar = value[0];
+            char firstChar = value[0];
-            var rest = value[1..];
+            string rest = value[1..];
 
             return $"{char.ToUpper(firstChar)}{rest}";
         }

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,
@@ -51,7 +42,7 @@ namespace Ryujinx.Ava.Utilities.Compat
             InitializeComponent();
         }
 
-        private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
+        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
         {
             if (DataContext is not CompatibilityViewModel cvm)
                 return;

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))
+                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid)))
-                || _appLibrary.Applications.Items.Any(a => a.Name.EqualsIgnoreCase(x.GameName)))
             : _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))));
         }