fix race condition on Linux with the disc already mounted

it could result in a message that no disc keys were found until you restart the dumper
13xforever · Feb 2, 2024 · d1a8175 · d1a8175
1 parent 7a1a0d6
commit d1a8175
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/Ps3DiscDumper/SettingsProvider.cs b/Ps3DiscDumper/SettingsProvider.cs
@@ -22,9 +22,22 @@ static SettingsProvider()
             settingsFolder = Path.Combine(Environment.GetFolderPath(SpecialFolder.LocalApplicationData), "ps3-disc-dumper");
             settingsPath = Path.Combine(settingsFolder, "settings.json");
             if (File.Exists(settingsPath))
+            {
+                Log.Debug("Found existing settings file, reading…");
                 savedSettings = Read() ?? savedSettings;
+            }
             else
-                savedSettings = Import() ?? savedSettings;
+            {
+                if (OperatingSystem.IsWindows())
+                {
+                    Log.Debug("No existing settings file was found, trying to import legacy settings…");
+                    savedSettings = Import() ?? savedSettings;
+                }
+                else
+                {
+                    Log.Debug("Using default settings");
+                }
+            }
             Settings = savedSettings;
         }
         catch (Exception e)

diff --git a/UI.Avalonia/ViewModels/MainViewModel.cs b/UI.Avalonia/ViewModels/MainViewModel.cs
@@ -46,6 +46,7 @@ public MainViewModel(): this(new()){}
     [ObservableProperty] private bool? validated;
 
     internal Dumper? dumper;
+    private readonly SemaphoreSlim scanLock = new(1, 1);
 
     partial void OnDiscInfoExpandedChanged(bool value)
     {
@@ -99,6 +100,13 @@ private void CancelDump()
 
     private async Task ScanDiscsAsync()
     {
+        // ReSharper disable once MethodHasAsyncOverload
+        if (!scanLock.Wait(0))
+        {
+            Log.Debug("Another disc scan is already in progress, ignoring call");
+            return;
+        }
+
         ResetViewModel();
 
         FoundDisc = true;

diff --git a/UI.Avalonia/ViewModels/MainWindowViewModel.cs b/UI.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -4,6 +4,7 @@
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using IrdLibraryClient;
 using Ps3DiscDumper;
 using Ps3DiscDumper.POCOs;
 
@@ -53,6 +54,7 @@ private void ToggleSettingsPage()
             {
                 Dispatcher.UIThread.Post(() =>
                 {
+                    Log.Debug("Settings were changed, trying to re-scan the disc if present…");
                     mainPage.ResetViewModelCommand.Execute(null);
                     mainPage.ScanDiscsCommand.Execute(null);
                 }, DispatcherPriority.Background);

diff --git a/UI.Avalonia/Views/MainWindow.axaml.cs b/UI.Avalonia/Views/MainWindow.axaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
+using IrdLibraryClient;
 using UI.Avalonia.Utils;
 using UI.Avalonia.Utils.ColorPalette;
 using UI.Avalonia.ViewModels;
@@ -61,6 +62,7 @@ private void OnLoaded(object? sender, RoutedEventArgs e)
 
         Dispatcher.UIThread.Post(() =>
         {
+            Log.Debug("Main window is loaded, trying to scan the disc…");
             mvm.ResetViewModelCommand.Execute(null);
             mvm.ScanDiscsCommand.Execute(null);
         }, DispatcherPriority.Background);

diff --git a/UI.Avalonia/Views/MainWindow.axaml.linux.cs b/UI.Avalonia/Views/MainWindow.axaml.linux.cs
@@ -71,7 +71,10 @@ private void MonitorDmesg()
                                         DumperIsReady: false
                                     }
                                 })
+                            {
+                                Log.Debug($"Found udf mount message, trying to scan disc drives… ({nameof(vm.DumpingInProgress)}: {vm.DumpingInProgress}, {nameof(vm.FoundDisc)}: {vm.FoundDisc}, {nameof(vm.DumperIsReady)}: {vm.DumperIsReady})");
                                 vm.ScanDiscsCommand.Execute(null);
+                            }
                         }, DispatcherPriority.Background);
                     }
                     else if (line.Contains("busy inodes on changed media sr"))