From f7abf9f374a3910b5b64136b4135925253ff7d64 Mon Sep 17 00:00:00 2001
From: Loporrit <141286461+loporrit@users.noreply.github.com>
Date: Mon, 24 Feb 2025 01:56:00 +0000
Subject: [PATCH] Stop getting file scanner stuck omg

---
 MareSynchronos/FileCache/CacheMonitor.cs      | 22 ++++++++-----------
 .../Services/Mediator/MareMediator.cs         |  4 ----
 MareSynchronos/UI/UISharedService.cs          |  4 ++--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/MareSynchronos/FileCache/CacheMonitor.cs b/MareSynchronos/FileCache/CacheMonitor.cs
index 9984f14..614b253 100644
--- a/MareSynchronos/FileCache/CacheMonitor.cs
+++ b/MareSynchronos/FileCache/CacheMonitor.cs
@@ -6,6 +6,7 @@ using MareSynchronos.Utils;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.Collections.Immutable;
+using System.Runtime.CompilerServices;
 
 namespace MareSynchronos.FileCache;
 
@@ -92,16 +93,15 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
     public long CurrentFileProgress => _currentFileProgress;
     public long FileCacheSize { get; set; }
     public long FileCacheDriveFree { get; set; }
-    public ConcurrentDictionary<string, int> HaltScanLocks { get; set; } = new(StringComparer.Ordinal);
-    private int LockCount = 0;
+    public ConcurrentDictionary<string, StrongBox<int>> HaltScanLocks { get; set; } = new(StringComparer.Ordinal);
     public bool IsScanRunning => CurrentFileProgress > 0 || TotalFiles > 0;
     public long TotalFiles { get; private set; }
     public long TotalFilesStorage { get; private set; }
 
     public void HaltScan(string source)
     {
-        HaltScanLocks.AddOrUpdate(source, 1, (k, v) => v + 1);
-        Interlocked.Increment(ref LockCount);
+        HaltScanLocks.TryAdd(source, new(0));
+        Interlocked.Increment(ref HaltScanLocks[source].Value);
     }
 
     record WatcherChange(WatcherChangeTypes ChangeType, string? OldPath = null);
@@ -327,7 +327,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             do
             {
                 await Task.Delay(delay, token).ConfigureAwait(false);
-            } while (HaltScanLocks.Any(f => f.Value > 0));
+            } while (HaltScanLocks.Any(f => f.Value.Value > 0));
         }
         catch (TaskCanceledException)
         {
@@ -358,7 +358,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             do
             {
                 await Task.Delay(delay, token).ConfigureAwait(false);
-            } while (HaltScanLocks.Any(f => f.Value > 0));
+            } while (HaltScanLocks.Any(f => f.Value.Value > 0));
         }
         catch (TaskCanceledException)
         {
@@ -454,7 +454,7 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
             do
             {
                 await Task.Delay(delay, token).ConfigureAwait(false);
-            } while (HaltScanLocks.Any(f => f.Value > 0));
+            } while (HaltScanLocks.Any(f => f.Value.Value > 0));
         }
         catch (TaskCanceledException)
         {
@@ -571,16 +571,12 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
     public void ResetLocks()
     {
         HaltScanLocks.Clear();
-        LockCount = 0;
     }
 
     public void ResumeScan(string source)
     {
-        HaltScanLocks.AddOrUpdate(source, 0, (k, v) => Math.Max(0, v - 1));
-        int lockCount = Interlocked.Decrement(ref LockCount);
-
-        if (lockCount == 0)
-            HaltScanLocks.Clear();
+        HaltScanLocks.TryAdd(source, new(0));
+        Interlocked.Decrement(ref HaltScanLocks[source].Value);
     }
 
     protected override void Dispose(bool disposing)
diff --git a/MareSynchronos/Services/Mediator/MareMediator.cs b/MareSynchronos/Services/Mediator/MareMediator.cs
index de54e8c..40561a4 100644
--- a/MareSynchronos/Services/Mediator/MareMediator.cs
+++ b/MareSynchronos/Services/Mediator/MareMediator.cs
@@ -75,12 +75,8 @@ public sealed class MareMediator : IHostedService
 
                 await Task.Delay(100, _loopCts.Token).ConfigureAwait(false);
 
-                HashSet<MessageBase> processedMessages = [];
                 while (_messageQueue.TryDequeue(out var message))
                 {
-                    if (processedMessages.Contains(message)) { continue; }
-                    processedMessages.Add(message);
-
                     ExecuteMessage(message);
                 }
             }
diff --git a/MareSynchronos/UI/UISharedService.cs b/MareSynchronos/UI/UISharedService.cs
index 9ca6614..9de4136 100644
--- a/MareSynchronos/UI/UISharedService.cs
+++ b/MareSynchronos/UI/UISharedService.cs
@@ -671,11 +671,11 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase
                 "this is due to the scanner normally ignoring those files but the game loading them in and using them on your character, so they get " +
                 "added to the local storage.");
         }
-        else if (_cacheMonitor.HaltScanLocks.Any(f => f.Value > 0))
+        else if (_cacheMonitor.HaltScanLocks.Any(f => f.Value.Value > 0))
         {
             ImGui.AlignTextToFramePadding();
 
-            ImGui.TextUnformatted("Halted (" + string.Join(", ", _cacheMonitor.HaltScanLocks.Where(f => f.Value > 0).Select(locker => locker.Key + ": " + locker.Value + " halt requests")) + ")");
+            ImGui.TextUnformatted("Halted (" + string.Join(", ", _cacheMonitor.HaltScanLocks.Where(f => f.Value.Value > 0).Select(locker => locker.Key + ": " + locker.Value.Value)) + ")");
             ImGui.SameLine();
             if (ImGui.Button("Reset halt requests##clearlocks"))
             {