Merge pull request #16 from SubZeroPL/games-without-id

Games without Id

Author: SubZeroPL

AssM.csproj

@@ -5,23 +5,23 @@
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
-        <Version>1.6.0</Version>
+        <Version>1.6.1</Version>
         <Authors>SubZeroPL</Authors>
         <PackageProjectUrl>https://github.com/SubZeroPL/AssM/</PackageProjectUrl>
-        <AssemblyVersion>1.6.0</AssemblyVersion>
-        <FileVersion>1.6.0</FileVersion>
+        <AssemblyVersion>1.6.1</AssemblyVersion>
+        <FileVersion>1.6.1</FileVersion>
         <Title>AssM</Title>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.2.3" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
+        <PackageReference Include="Avalonia" Version="11.3.0" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
-        <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.0" />
+        <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" />
         <PackageReference Include="Markdown.Avalonia" Version="11.0.3-a1"/>
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
         <PackageReference Include="NLog" Version="5.4.0" />

Classes/Functions.cs

@@ -216,10 +216,16 @@ public static List<string> GetReadmeFilesInDirectory(string directory)
         return result;
     }
 
-    public static Game AddGameToList(string cuePath, Configuration configuration, ObservableCollection<Game> gameList)
+    public static Game? AddGameToList(string cuePath, Configuration configuration, ObservableCollection<Game> gameList)
     {
         Logger.Debug($"Adding game to list from {cuePath}");
         var di = DiscInspector.ScanDisc(cuePath);
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract - apparently there are games that have no Id in image (like SLPS-00018)
+        if (di.Data.SerialNumber == null)
+        {
+            Logger.Error($"Failed to add game to list from {cuePath}{Environment.NewLine}Id not present in image");
+            return null;
+        }
         var title = configuration.GetTitleFromCue ? Path.GetFileNameWithoutExtension(cuePath) : di.Data.GameTitle;
         var game = new Game
         {

Windows/AddFolderProgressWindow.axaml.cs

@@ -28,9 +28,10 @@ private void WorkerOnProgressChanged(object? sender, ProgressChangedEventArgs e)
             LabelFolderName.Content = dir;
     }
 
-    public void Process(List<string> dirs, ObservableCollection<Game> gameList, Configuration configuration, Action finishedCallback)
+    public void Process(List<string> dirs, ObservableCollection<Game> gameList, Configuration configuration, Action<List<string>> finishedCallback)
     {
         var cueFiles = new List<string>();
+        var errors = new List<string>();
         _worker.DoWork += (_, _) =>
         {
             foreach (var dir in dirs)
@@ -43,7 +44,11 @@ public void Process(List<string> dirs, ObservableCollection<Game> gameList, Conf
             foreach (var cueFile in cueFiles)
             {
                 if (_worker.CancellationPending) return;
-                Functions.AddGameToList(cueFile, configuration, gameList);
+                var game = Functions.AddGameToList(cueFile, configuration, gameList);
+                if (game == null)
+                {
+                    errors.Add($"Failed to add game to list from {cueFile}{Environment.NewLine}Id not present in image");
+                }
             }
 
             if (string.IsNullOrWhiteSpace(configuration.OutputDirectory)) return;
@@ -54,7 +59,7 @@ public void Process(List<string> dirs, ObservableCollection<Game> gameList, Conf
             }
         };
 
-        _worker.RunWorkerCompleted += (_, _) => finishedCallback.Invoke();
+        _worker.RunWorkerCompleted += (_, _) => finishedCallback.Invoke(errors);
 
         _worker.RunWorkerAsync();
     }

Windows/MainWindow.axaml.cs

@@ -134,6 +134,15 @@ private void AddGame(string cuePath)
     {
         if (string.IsNullOrWhiteSpace(cuePath)) return;
         var game = Functions.AddGameToList(cuePath, Configuration, GameList);
+        if (game == null)
+        {
+            MessageBoxManager.GetMessageBoxStandard("Error",
+                    $"Failed to add game to list from {cuePath}{Environment.NewLine}Id not present in image",
+                    ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Error, WindowStartupLocation.CenterOwner)
+                .ShowWindowDialogAsync(this);
+            return;
+        }
+
         if (string.IsNullOrWhiteSpace(TextBoxOutputDirectory.Text)) return;
         Functions.LoadExistingData(game, Configuration);
         game.Modified = true;
@@ -163,10 +172,17 @@ private void AddFolderButton_OnClick(object? sender, RoutedEventArgs e)
             .ToList() ?? [];
         var progress = new AddFolderProgressWindow();
         _ = progress.ShowDialog(this);
-        progress.Process(dirs, GameList, Configuration, () =>
+        progress.Process(dirs, GameList, Configuration, (errors) =>
         {
             progress.Close();
-            DataGridGameList.CollectionView.Refresh();    
+            DataGridGameList.CollectionView.Refresh();
+            if (errors.Count > 0)
+            {
+                MessageBoxManager.GetMessageBoxStandard("Error",
+                        string.Join(Environment.NewLine, errors),
+                        ButtonEnum.Ok, MsBox.Avalonia.Enums.Icon.Error, WindowStartupLocation.CenterOwner)
+                    .ShowWindowDialogAsync(this);
+            }
         });
     }