disable data application and scanner in combat

MareSynchronos/Services/CharacterAnalyzer.cs

@@ -51,18 +51,27 @@ public sealed class CharacterAnalyzer : MediatorSubscriberBase, IDisposable
             CurrentFile = 1;
             Logger.LogDebug("=== Computing {amount} remaining files ===", remaining.Count);
 
-            Mediator.Publish(new HaltScanMessage("CharacterAnalyzer"));
-
-            foreach (var file in remaining)
+            Mediator.Publish(new HaltScanMessage(nameof(CharacterAnalyzer)));
+            try
             {
-                Logger.LogDebug("Computing file {file}", file.FilePaths[0]);
-                await file.ComputeSizes(_fileCacheManager, cancelToken).ConfigureAwait(false);
-                CurrentFile++;
+                foreach (var file in remaining)
+                {
+                    Logger.LogDebug("Computing file {file}", file.FilePaths[0]);
+                    await file.ComputeSizes(_fileCacheManager, cancelToken).ConfigureAwait(false);
+                    CurrentFile++;
+                }
+
+                _fileCacheManager.WriteOutFullCsv();
+
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning(ex, "Failed to analyze files");
+            }
+            finally
+            {
+                Mediator.Publish(new ResumeScanMessage(nameof(CharacterAnalyzer)));
             }
-
-            _fileCacheManager.WriteOutFullCsv();
-
-            Mediator.Publish(new ResumeScanMessage("CharacterAnalzyer"));
         }
 
         Mediator.Publish(new CharacterDataAnalyzedMessage());

MareSynchronos/Services/DalamudUtilService.cs

@@ -35,7 +35,8 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private bool _sentBetweenAreas = false;
 
     public DalamudUtilService(ILogger<DalamudUtilService> logger, IClientState clientState, IObjectTable objectTable, IFramework framework,
-        IGameGui gameGui, ICondition condition, IDataManager gameData, ITargetManager targetManager, MareMediator mediator, PerformanceCollectorService performanceCollector)
+        IGameGui gameGui, ICondition condition, IDataManager gameData, ITargetManager targetManager,
+        MareMediator mediator, PerformanceCollectorService performanceCollector)
     {
         _logger = logger;
         _clientState = clientState;
@@ -73,6 +74,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     public bool IsLoggedIn { get; private set; }
     public bool IsOnFrameworkThread => _framework.IsInFrameworkUpdateThread;
     public bool IsZoning => _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51];
+    public bool IsInCombat { get; private set; } = false;
 
     public Lazy<Dictionary<ushort, string>> WorldData { get; private set; }
 
@@ -457,19 +459,34 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             Mediator.Publish(new GposeEndMessage());
         }
 
+        if (_condition[ConditionFlag.InCombat] && !IsInCombat)
+        {
+            _logger.LogDebug("Combat start");
+            IsInCombat = true;
+            Mediator.Publish(new CombatStartMessage());
+            Mediator.Publish(new HaltScanMessage(nameof(IsInCombat)));
+        }
+        else if (!_condition[ConditionFlag.InCombat] && IsInCombat)
+        {
+            _logger.LogDebug("Combat end");
+            IsInCombat = false;
+            Mediator.Publish(new CombatEndMessage());
+            Mediator.Publish(new ResumeScanMessage(nameof(IsInCombat)));
+        }
+
         if (_condition[ConditionFlag.WatchingCutscene] && !IsInCutscene)
         {
             _logger.LogDebug("Cutscene start");
             IsInCutscene = true;
             Mediator.Publish(new CutsceneStartMessage());
-            Mediator.Publish(new HaltScanMessage("Cutscene"));
+            Mediator.Publish(new HaltScanMessage(nameof(IsInCutscene)));
         }
         else if (!_condition[ConditionFlag.WatchingCutscene] && IsInCutscene)
         {
             _logger.LogDebug("Cutscene end");
             IsInCutscene = false;
             Mediator.Publish(new CutsceneEndMessage());
-            Mediator.Publish(new ResumeScanMessage("Cutscene"));
+            Mediator.Publish(new ResumeScanMessage(nameof(IsInCutscene)));
         }
 
         if (IsInCutscene) { Mediator.Publish(new CutsceneFrameworkUpdateMessage()); return; }
@@ -485,7 +502,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                     _logger.LogDebug("Zone switch/Gpose start");
                     _sentBetweenAreas = true;
                     Mediator.Publish(new ZoneSwitchStartMessage());
-                    Mediator.Publish(new HaltScanMessage("Zone switch"));
+                    Mediator.Publish(new HaltScanMessage(nameof(ConditionFlag.BetweenAreas)));
                 }
             }
 
@@ -497,10 +514,11 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             _logger.LogDebug("Zone switch/Gpose end");
             _sentBetweenAreas = false;
             Mediator.Publish(new ZoneSwitchEndMessage());
-            Mediator.Publish(new ResumeScanMessage("Zone switch"));
+            Mediator.Publish(new ResumeScanMessage(nameof(ConditionFlag.BetweenAreas)));
         }
 
-        Mediator.Publish(new FrameworkUpdateMessage());
+        if (!IsInCombat)
+            Mediator.Publish(new FrameworkUpdateMessage());
 
         if (DateTime.Now < _delayedFrameworkUpdateCheck.AddSeconds(1)) return;
 
@@ -520,6 +538,9 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
             Mediator.Publish(new DalamudLogoutMessage());
         }
 
+        if (IsInCombat)
+            Mediator.Publish(new FrameworkUpdateMessage());
+
         Mediator.Publish(new DelayedFrameworkUpdateMessage());
 
         _delayedFrameworkUpdateCheck = DateTime.Now;

MareSynchronos/Services/Mediator/Messages.cs

@@ -18,7 +18,7 @@ public record OpenSettingsUiMessage : MessageBase;
 public record DalamudLoginMessage : MessageBase;
 public record DalamudLogoutMessage : MessageBase;
 public record FrameworkUpdateMessage : SameThreadMessage;
-public record ClassJobChangedMessage(GameObjectHandler gameObjectHandler) : MessageBase;
+public record ClassJobChangedMessage(GameObjectHandler GameObjectHandler) : MessageBase;
 public record DelayedFrameworkUpdateMessage : SameThreadMessage;
 public record ZoneSwitchStartMessage : MessageBase;
 public record ZoneSwitchEndMessage : MessageBase;
@@ -78,6 +78,8 @@ public record OpenPermissionWindow(Pair Pair) : MessageBase;
 public record DownloadLimitChangedMessage() : SameThreadMessage;
 public record CensusUpdateMessage(byte Gender, byte RaceId, byte TribeId) : MessageBase;
 public record TargetPairMessage(Pair Pair) : MessageBase;
+public record CombatStartMessage : MessageBase;
+public record CombatEndMessage : MessageBase;
 
 #pragma warning restore S2094
 #pragma warning restore MA0048 // File name must match type name

MareSynchronos/Services/PerformanceCollectorService.cs

@@ -173,7 +173,7 @@ public sealed class PerformanceCollectorService : IHostedService
             {
                 try
                 {
-                    var last = entries.Value.Last();
+                    var last = entries.Value.ToList().Last();
                     if (last.Item1.AddMinutes(10) < TimeOnly.FromDateTime(DateTime.Now) && !_performanceCounters.TryRemove(entries.Key, out _))
                     {
                         _logger.LogDebug("Could not remove performance counter {counter}", entries.Key);