Manager: Use DebounceThrottle library for debouncing

gw2scratch · Oct 8, 2023 · d0358a9 · d0358a9
1 parent ff405e1
commit d0358a9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 90 deletions.
diff --git a/ArcdpsLogManager/ArcdpsLogManager.csproj b/ArcdpsLogManager/ArcdpsLogManager.csproj
@@ -20,6 +20,7 @@
  <Version>1.10.0.5</Version>
  </PropertyGroup>
  <ItemGroup>
+ <PackageReference Include="DebounceThrottle" Version="2.0.0" />
  <PackageReference Include="Eto.Forms" Version="2.6.1" />
  <PackageReference Include="Gw2Sharp" Version="0.6.0" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />

diff --git a/ArcdpsLogManager/CHANGELOG.md b/ArcdpsLogManager/CHANGELOG.md
@@ -16,6 +16,7 @@ This is the full changelog of the arcdps Log Manager.
 - Improved log processing performance ~1.25x for 10man logs, even more in WvW logs.
 - Also improved log processing performance by further ~2.60x for all logs (~35% of original time).
 - Yes, that is about 3.25x speedup overall.
+- Also made character and guild search more responsive (thank you, @Denrage!).
 
 #### Fixes
 - Fixed Harvest Temple success detection.

diff --git a/ArcdpsLogManager/Sections/GuildList.cs b/ArcdpsLogManager/Sections/GuildList.cs
@@ -1,3 +1,4 @@
+using DebounceThrottle;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -26,8 +27,8 @@ public class GuildList : DynamicLayout
 
  private ObservableCollection<GuildData> guildData;
  private SelectableFilterCollection<GuildData> filtered;
- private Task debounceFilterTask;
- private CancellationTokenSource debounceFilterCancellationTokenSource;
+
+ private readonly DebounceDispatcher debounceDispatcher = new DebounceDispatcher(200);
 
  private readonly GridViewSorter<GuildData> sorter;
  private readonly GridView<GuildData> guildGridView;
@@ -77,53 +78,15 @@ public GuildList(LogCache logCache, ApiData apiData, LogDataProcessor logProcess
 
  var playerFilterBox = new TextBox();
  playerFilterBox.TextBinding.Bind(this, x => x.GuildFilter);
- playerFilterBox.TextChanged += (sender, args) =>
+ playerFilterBox.TextChanged += (_, _) =>
  {
- if (this.debounceFilterCancellationTokenSource != null)
- {
- this.debounceFilterCancellationTokenSource.Cancel();
- try
- {
- this.debounceFilterTask.Wait();
- }
- catch (AggregateException ex)
- {
- if (ex.InnerException is TaskCanceledException)
- {
- // NOP
- }
- else
- {
- throw;
- }
- }
- this.debounceFilterTask.Dispose();
- this.debounceFilterCancellationTokenSource.Dispose();
- this.debounceFilterTask = null;
- this.debounceFilterCancellationTokenSource = null;
- }
-
- this.debounceFilterCancellationTokenSource = new CancellationTokenSource();
- this.debounceFilterTask = Task.Run(async () =>
- {
- await Task.Delay(200, this.debounceFilterCancellationTokenSource.Token);
- this.debounceFilterCancellationTokenSource.Token.ThrowIfCancellationRequested();
-
- await Application.Instance.InvokeAsync(() =>
+ debounceDispatcher.Debounce(() =>
+ Application.Instance.InvokeAsync(() =>
  {
  guildGridView.UnselectAll();
  Refresh();
- });
- _ = Task.Run(() =>
- {
- this.debounceFilterCancellationTokenSource.Cancel();
- this.debounceFilterTask.Wait();
- this.debounceFilterTask.Dispose();
- this.debounceFilterCancellationTokenSource.Dispose();
- this.debounceFilterTask = null;
- this.debounceFilterCancellationTokenSource = null;
- });
- });
+ })
+ );
  };
 
  BeginVertical(spacing: new Size(5, 5), padding: new Padding(5));

diff --git a/ArcdpsLogManager/Sections/PlayerList.cs b/ArcdpsLogManager/Sections/PlayerList.cs
@@ -1,3 +1,4 @@
+using DebounceThrottle;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -26,8 +27,7 @@ public class PlayerList : DynamicLayout
 
  private ObservableCollection<PlayerData> playerData;
  private SelectableFilterCollection<PlayerData> filtered;
- private Task debounceFilterTask;
- private CancellationTokenSource debounceFilterCancellationTokenSource;
+ private readonly DebounceDispatcher debounceDispatcher = new DebounceDispatcher(200);
 
  private readonly GridView<PlayerData> playerGridView;
  private readonly GridViewSorter<PlayerData> sorter;
@@ -85,52 +85,13 @@ public PlayerList(LogCache logCache, ApiData apiData, LogDataProcessor logProces
  var playerFilterBox = new TextBox();
  playerFilterBox.TextBinding.Bind(this, x => x.PlayerFilter);
  playerFilterBox.TextChanged += (sender, args) => {
-
- if (this.debounceFilterCancellationTokenSource != null)
- {
- this.debounceFilterCancellationTokenSource.Cancel();
- try
- {
- this.debounceFilterTask.Wait();
- }
- catch (AggregateException ex)
- {
- if (ex.InnerException is TaskCanceledException)
- {
- // NOP
- }
- else
- {
- throw;
- }
- }
- this.debounceFilterTask.Dispose();
- this.debounceFilterCancellationTokenSource.Dispose();
- this.debounceFilterTask = null;
- this.debounceFilterCancellationTokenSource = null;
- }
-
- this.debounceFilterCancellationTokenSource = new CancellationTokenSource();
- this.debounceFilterTask = Task.Run(async () =>
- {
- await Task.Delay(200, this.debounceFilterCancellationTokenSource.Token);
- this.debounceFilterCancellationTokenSource.Token.ThrowIfCancellationRequested();
-
- await Application.Instance.InvokeAsync(() =>
+ debounceDispatcher.Debounce(() =>
+ Application.Instance.InvokeAsync(() =>
  {
  playerGridView.UnselectAll();
  Refresh();
- });
- _ = Task.Run(() =>
- {
- this.debounceFilterCancellationTokenSource.Cancel();
- this.debounceFilterTask.Wait();
- this.debounceFilterTask.Dispose();
- this.debounceFilterCancellationTokenSource.Dispose();
- this.debounceFilterTask = null;
- this.debounceFilterCancellationTokenSource = null;
- });
- });
+ })
+ );
  };
 
  BeginVertical(spacing: new Size(5, 5), padding: new Padding(5));