Add login and logout events to control the stopwatch.

Queue existing data only once on logout and plugin init.
Kurochi51 · Mar 3, 2024 · e57e44a · e57e44a
1 parent 6382bbd
commit e57e44a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 15 deletions.
diff --git a/PetScale/PetScale.cs b/PetScale/PetScale.cs
@@ -34,8 +34,8 @@ public sealed class PetScale : IDalamudPlugin
     private readonly ICommandManager commandManager;
     private readonly IFramework framework;
     private readonly IPluginLog log;
-    private readonly IClientState clientState;
     private readonly Utilities utilities;
+    public readonly IClientState clientState;
 
     private readonly StringComparison ordinalComparison = StringComparison.Ordinal;
     private readonly Dictionary<Pointer<BattleChara>, (Pointer<Character> character, bool petSet)> activePetDictionary = new();
@@ -97,18 +97,44 @@ public PetScale(DalamudPluginInterface _pluginInterface,
         pluginInterface.UiBuilder.Draw += WindowSystem.Draw;
         pluginInterface.UiBuilder.OpenConfigUi += ConfigWindow.Toggle;
         clientState.TerritoryChanged += TerritoryChanged;
+        clientState.Login += SetStopwatch;
+        clientState.Logout += SetStopwatch;
         framework.Update += OnFrameworkUpdate;
         stopwatch.Start();
 
         _ = Task.Run(InitSheet);
         ConfigWindow.Save(save: false);
+        QueueOnlyExistingData();
+    }
+
+    private void SetStopwatch()
+    {
+        playerName = clientState.LocalPlayer?.Name.TextValue;
+        if (clientState.IsLoggedIn)
+        {
+            stopwatch.Start();
+        }
+        else
+        {
+            QueueOnlyExistingData();
+            stopwatch.Stop();
+        }
     }
 
     private void TerritoryChanged(ushort obj)
     {
         stopwatch.Restart();
     }
 
+    private void QueueOnlyExistingData()
+    {
+        players.Clear();
+        foreach (var entry in config.PetData.Select(item => item.CharacterName).Distinct(StringComparer.OrdinalIgnoreCase))
+        {
+            players.Enqueue(entry);
+        }
+    }
+
     private void InitSheet()
     {
         var petSheet = utilities.GetSheet<Pet>(clientState.ClientLanguage);
@@ -148,19 +174,6 @@ private unsafe void OnFrameworkUpdate(IFramework framework)
 #endif
         if (clientState is not { LocalPlayer: { } player })
         {
-            if (playerName is not null)
-            {
-                playerName = null;
-            }
-            players.Clear();
-            foreach (var entry in config.PetData.Select(item => item.CharacterName).Distinct(StringComparer.OrdinalIgnoreCase))
-            {
-                players.Enqueue(entry);
-            }
-            if (stopwatch.IsRunning)
-            {
-                stopwatch.Stop();
-            }
             return;
         }
         if (requestedCache)
@@ -350,7 +363,10 @@ public void Dispose()
     {
         stopwatch.Stop();
         players.Clear();
+
         framework.Update -= OnFrameworkUpdate;
+        clientState.Login -= SetStopwatch;
+        clientState.Logout -= SetStopwatch;
         clientState.TerritoryChanged -= TerritoryChanged;
         pluginInterface.UiBuilder.OpenConfigUi -= ConfigWindow.Toggle;
         pluginInterface.UiBuilder.Draw -= WindowSystem.Draw;

diff --git a/PetScale/Windows/ConfigWindow.cs b/PetScale/Windows/ConfigWindow.cs
@@ -89,7 +89,7 @@ public override void OnClose()
     public override void Draw()
     {
         ResizeIfNeeded();
-        ImGui.TextUnformatted("Amount of players: " + (players.Count > 2 ? players.Count - 1 : players.Count).ToString(CultureInfo.InvariantCulture));
+        ImGui.TextUnformatted("Amount of players: " + GetPlayerCount(players.Count, plugin.clientState.IsLoggedIn).ToString(CultureInfo.InvariantCulture));
         var buttonPressed = false;
         DrawComboBox("Characters", charaName, charaWidth, out charaName, players, filter: true);
         ImGui.SameLine();
@@ -429,6 +429,19 @@ public void Save(bool save)
         }
     }
 
+    private static int GetPlayerCount(int queueCount, bool loggedIn)
+    {
+        if (!loggedIn)
+        {
+            return 0;
+        }
+        return queueCount switch
+        {
+            < 2 => 0,
+            >= 2 => queueCount - 1,
+        };
+    }
+
     private async void QueueColumnWidthChange(IFontHandle handle, ILockedImFont lockedFont)
     {
         while (!handle.Available && !cToken.IsCancellationRequested)