Merge branch 'master' into master

Sort alphabetically,
Remove title IDs in "issue_title" column,
and remove all entries without a playability status.

src/Ryujinx/Assets/locales.json

@@ -10435,7 +10435,7 @@
         "it_IT": "Finestra di input",
         "ja_JP": "入力ダイアログ",
         "ko_KR": "대화 상자 입력",
-        "no_NO": "",
+        "no_NO": "Dialogboksen Inndata",
         "pl_PL": "Okno Dialogowe Wprowadzania",
         "pt_BR": "Diálogo de texto",
         "ru_RU": "Диалоговое окно ввода",
@@ -22610,7 +22610,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Denne kompatibilitetslisten kan inneholde oppføringer som er tomme for data.\nVær ikke imot å teste spill i statusen «Ingame».",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22635,7 +22635,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Søk i kompatibilitetsoppføringer...",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22660,7 +22660,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Åpne kompatibilitetslisten",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22685,7 +22685,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Vis bare eide spill",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22710,7 +22710,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Spillbar",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22760,7 +22760,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Menyer",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22785,7 +22785,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Starter",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22810,7 +22810,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Ingenting",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22823,4 +22823,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -3,6 +3,7 @@ using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 
@@ -32,21 +33,18 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
         {
-            IssueNumber = row[header.IndexOf("issue_number")].Parse<int>();
+            if (row.ColCount != header.ColNames.Count)
-
+                throw new InvalidDataException($"CSV row {row.RowIndex} ({row.ToString()}) has mismatched column count");
-            var titleIdRow = row[header.IndexOf("extracted_game_id")].ToString();
+            
+            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('"');
 
-            var issueTitleRow = row[header.IndexOf("issue_title")].ToString();
+            IssueLabels = ColStr(row[header.IndexOf("\"labels\"")]).Split(';');
-            if (TitleId.HasValue)
+            Status = ColStr(row[header.IndexOf("\"status\"")]).ToLower() switch
-                issueTitleRow = issueTitleRow.ReplaceIgnoreCase($" - {TitleId}", string.Empty);
-
-            GameName = issueTitleRow.Trim().Trim('"');
-
-            IssueLabels = row[header.IndexOf("issue_labels")].ToString().Split(';');
-            Status = row[header.IndexOf("extracted_status")].ToString().ToLower() switch
             {
                 "playable" => LocaleKeys.CompatibilityListPlayable,
                 "ingame" => LocaleKeys.CompatibilityListIngame,
@@ -56,20 +54,19 @@ namespace Ryujinx.Ava.Utilities.Compat
                 _ => null
             };
 
-            if (row[header.IndexOf("last_event_date")].TryParse<DateTime>(out var dt))
+            if (DateTime.TryParse(ColStr(row[header.IndexOf("\"last_updated\"")]), out var dt))
                 LastEvent = dt;
 
-            if (row[header.IndexOf("events_count")].TryParse<int>(out var eventsCount))
+            return;
-                EventCount = eventsCount;
+            
+            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 LocaleKeys? Status { get; }
         public DateTime LastEvent { get; }
-        public int EventCount { get; }
 
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
         public string FormattedTitleId => TitleId
@@ -83,13 +80,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(Status)}=\"{Status}\", ");
-            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\", ");
+            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\"");
-            sb.Append($"{nameof(EventCount)}={EventCount}");
             sb.Append('}');
 
             return sb.ToString();