Debounce config saving

OpenShock · Jul 23, 2024 · 29eba35 · 29eba35
1 parent 3922a63
commit 29eba35
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 51 deletions.
diff --git a/ShockOsc/Config/ConfigManager.cs b/ShockOsc/Config/ConfigManager.cs
@@ -8,18 +8,23 @@ namespace OpenShock.ShockOsc.Config;
 
 public sealed class ConfigManager
 {
-    private static readonly string Path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\OpenShock\ShockOSC\config.json";
-
+    private static readonly string Path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +
+                                          @"\OpenShock\ShockOSC\config.json";
+
     private readonly ILogger<ConfigManager> _logger;
     public ShockOscConfig Config { get; }
 
+    private readonly Timer _saveTimer;
+
     public ConfigManager(ILogger<ConfigManager> logger)
     {
         _logger = logger;
 
+        _saveTimer = new Timer(_ => { OsTask.Run(SaveInternally); });
+
         // Load config
         ShockOscConfig? config = null;
-        
+
         _logger.LogInformation("Config file found, trying to load config from {Path}", Path);
         if (File.Exists(Path))
         {
@@ -47,9 +52,11 @@ public ConfigManager(ILogger<ConfigManager> logger)
             _logger.LogInformation("Successfully loaded config");
             return;
         }
-        _logger.LogInformation("No config file found (does not exist or empty or invalid), generating new one at {Path}", Path);
+
+        _logger.LogInformation(
+            "No config file found (does not exist or empty or invalid), generating new one at {Path}", Path);
         Config = new ShockOscConfig();
-        SaveAsync().Wait();
+        SaveInternally().Wait();
         _logger.LogInformation("New configuration file generated!");
     }
 
@@ -58,10 +65,10 @@ public ConfigManager(ILogger<ConfigManager> logger)
         WriteIndented = true,
         Converters = { new JsonStringEnumConverter(), new SemVersionJsonConverter() }
     };
-    
+
     private readonly SemaphoreSlim _saveLock = new(1, 1);
 
-    public async Task SaveAsync()
+    private async Task SaveInternally()
     {
         await _saveLock.WaitAsync().ConfigureAwait(false);
         try
@@ -70,14 +77,14 @@ public async Task SaveAsync()
             var directory = System.IO.Path.GetDirectoryName(Path);
             if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
                 Directory.CreateDirectory(directory);
-            
+
             await File.WriteAllTextAsync(Path, JsonSerializer.Serialize(Config, Options)).ConfigureAwait(false);
             _logger.LogInformation("Config saved");
         }
         catch (Exception e)
         {
             _logger.LogError(e, "Error occurred while saving new config file");
-        } 
+        }
         finally
         {
             _saveLock.Release();
@@ -86,9 +93,9 @@ public async Task SaveAsync()
 
     public void Save()
     {
-        SaveAsync().Wait();
+        lock (_saveTimer)
+        {
+            _saveTimer.Change(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan);            
+        }
     }
-
-    public void SaveFnf() => OsTask.Run(SaveAsync);
-
 }
diff --git a/ShockOsc/Services/AuthService.cs b/ShockOsc/Services/AuthService.cs
@@ -66,7 +66,7 @@ public async Task Logout()
         Authenticated = false;
 
         _configManager.Config.OpenShock.Token = string.Empty;
-        await _configManager.SaveAsync();
+        _configManager.Save();
 
         _logger.LogInformation("Logging out");
         await _hubClient.StopAsync();

diff --git a/ShockOsc/Services/UnderscoreConfig.cs b/ShockOsc/Services/UnderscoreConfig.cs
@@ -85,7 +85,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                 {
                     if (_configManager.Config.Behaviour.RandomIntensity == modeIntensity) return;
                     _configManager.Config.Behaviour.RandomIntensity = modeIntensity;
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
                 break;
@@ -95,7 +95,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                 {
                     if(_configManager.Config.Behaviour.RandomDuration == modeDuration) return;
                     _configManager.Config.Behaviour.RandomDuration = modeDuration;
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
                 break;
@@ -111,7 +111,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.FixedIntensity =
                         Math.Clamp((byte)Math.Round(intensityFloat * 100), (byte)0, (byte)100);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -128,7 +128,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.IntensityRange.Min =
                         MathUtils.ClampUint((uint)Math.Round(minIntensityFloat * 100), 0, 100);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -145,7 +145,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.IntensityRange.Max =
                         MathUtils.ClampUint((uint)Math.Round(maxIntensityFloat * 100), 0, 100);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -161,7 +161,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.DurationRange.Min =
                         MathUtils.ClampUint((uint)Math.Round(minDurationFloat * 10_000), 300, 30_000);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -177,7 +177,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.DurationRange.Max =
                         MathUtils.ClampUint((uint)Math.Round(maxDurationFloat * 10_000), 300, 30_000);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -193,7 +193,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.FixedDuration =
                         MathUtils.ClampUint((uint)Math.Round(durationFloat * 10_000), 300, 10_000);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -210,7 +210,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.CooldownTime =
                         MathUtils.ClampUint((uint)Math.Round(cooldownTimeFloat * 100000), 0, 100000);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 
@@ -226,7 +226,7 @@ private void HandleGlobalConfigCommand(string action, object? value)
                     _configManager.Config.Behaviour.HoldTime =
                         MathUtils.ClampUint((uint)Math.Round(holdTimeFloat * 1000), 0, 1000);
                     ValidateSettings();
-                    _configManager.SaveFnf();
+                    _configManager.Save();
                     OnConfigUpdate?.Invoke(); // update Ui
                 }
 

diff --git a/ShockOsc/Ui/Pages/Authentication/Authenticate.razor b/ShockOsc/Ui/Pages/Authentication/Authenticate.razor
@@ -77,7 +77,7 @@
     {
         if (string.IsNullOrEmpty(PipeService.Token) || _currentState != State.Login) return false;
         ConfigManager.Config.OpenShock.Token = PipeService.Token;
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
         PipeService.Token = null;
         await ProceedAuthenticated();
         return true;

diff --git a/ShockOsc/Ui/Pages/Authentication/LoginPart.razor b/ShockOsc/Ui/Pages/Authentication/LoginPart.razor
@@ -87,7 +87,7 @@
 
     public async Task Login()
     {
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
         await ProceedAuthenticated();
     }
 

diff --git a/ShockOsc/Ui/Pages/Dash/Components/UpdateDialog.razor b/ShockOsc/Ui/Pages/Dash/Components/UpdateDialog.razor
@@ -21,10 +21,10 @@
         InvokeAsync(StateHasChanged);
     }
 
-    private async Task Skip()
+    private void Skip()
     {
         ConfigManager.Config.App.LastIgnoredVersion = Updater.LatestVersion;
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
         MudDialog.Close(DialogResult.Ok(true));
     }
 

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/AppSettingsTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/AppSettingsTab.razor
@@ -58,14 +58,14 @@
         InvokeAsync(StateHasChanged);
     }
 
-    private async Task OnSettingsValueChange()
+    private void OnSettingsValueChange()
     {
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
     }
 
     private async Task UpdateChannelChanged()
     {
-        await OnSettingsValueChange();
+        OnSettingsValueChange();
         await Updater.CheckUpdate();
     }
 

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/ChatboxTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/ChatboxTab.razor
@@ -14,7 +14,7 @@
     <br/>
     <MudCheckBox Class="option-width option-checkbox-height" @bind-Value="ConfigManager.Config.Chatbox.TimeoutEnabled" Label="Timeout (Clear) Chatbox Automatically"></MudCheckBox>
     <br/>
-    <DebouncedSlider T="uint" Size="Size.Large" Min="1_300" Max="30_000" Step="100" Style="margin-left: 16px; width: 500px !important;" @bind-SliderValue="@ConfigManager.Config.Chatbox.Timeout" OnSaveAction="_ => ConfigManager.SaveFnf()">
+    <DebouncedSlider T="uint" Size="Size.Large" Min="1_300" Max="30_000" Step="100" Style="margin-left: 16px; width: 500px !important;" @bind-SliderValue="@ConfigManager.Config.Chatbox.Timeout" OnSaveAction="_ => ConfigManager.Save()">
         Timeout: @MathF.Round(ConfigManager.Config.Chatbox.Timeout / 1000f, 1).ToString(CultureInfo.InvariantCulture)s
     </DebouncedSlider>
 </MudPaper>
@@ -61,9 +61,9 @@
 @code {
 
 
-    private async Task OnSettingsValueChange()
+    private void OnSettingsValueChange()
     {
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
     }
 
 }
diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/ConfigTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/ConfigTab.razor
@@ -122,7 +122,8 @@
 
     private Task OnSettingsValueChangeAsync()
     {
-        return Task.WhenAll(ConfigManager.SaveAsync(), underscoreConfig.SendUpdateForAll());
+        ConfigManager.Save();
+        return underscoreConfig.SendUpdateForAll();
     }
 
     protected override void OnInitialized()

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/GroupsTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/GroupsTab.razor
@@ -30,7 +30,7 @@
         Group = groupId;
 
         await InvokeAsync(StateHasChanged);
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
         await ShockOsc.RaiseOnGroupsChanged();
     }
 
@@ -41,17 +41,17 @@
         ConfigManager.Config.Groups.Remove(Group.Value);
         Group = null;
         await InvokeAsync(StateHasChanged);
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
         await ShockOsc.RaiseOnGroupsChanged();
     }
 
     private async Task OnSettingsValueChange()
     {
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
         await ShockOsc.RaiseOnGroupsChanged();
     }
 
-    private Task OnGroupSettingsValueChange() => ConfigManager.SaveAsync();
+    private void OnGroupSettingsValueChange() => ConfigManager.Save();
 
     private void OnGroupSelect()
     {
@@ -60,12 +60,12 @@
         InvokeAsync(StateHasChanged);
     }
 
-    private async Task OnSelectedShockersUpdate()
+    private void OnSelectedShockersUpdate()
     {
         if (CurrentGroup != null)
         {
             CurrentGroup.Shockers = _selectedShockers.ToList();
-            await ConfigManager.SaveAsync();
+            ConfigManager.Save();
         }
     }
 
@@ -112,7 +112,7 @@
         CurrentGroup.RandomIntensity = ConfigManager.Config.Behaviour.RandomIntensity;
 
         await InvokeAsync(StateHasChanged);
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
     }
 
     private async Task ResetDuration()
@@ -123,7 +123,7 @@
         CurrentGroup.RandomDuration = ConfigManager.Config.Behaviour.RandomDuration;
 
         await InvokeAsync(StateHasChanged);
-        await ConfigManager.SaveAsync();
+        ConfigManager.Save();
     }
 
 }
@@ -167,21 +167,21 @@
             @if (!CurrentGroup.RandomIntensity)
             {
                 <DebouncedSlider T="byte" Size="Size.Large" Min="0" Max="100" Class="openshock-slider-length" @bind-SliderValue="@CurrentGroup.FixedIntensity"
-                                 OnSaveAction="_ => ConfigManager.SaveFnf()">
+                                 OnSaveAction="_ => ConfigManager.Save()">
                     Intensity: @CurrentGroup.FixedIntensity%
                 </DebouncedSlider>
             }
             else
             {
                 <DebouncedSlider T="uint" Size="Size.Large" Min="0" Max="100" Class="openshock-slider-length" @bind-SliderValue="@CurrentGroup.IntensityRange.Min"
                                  OnValueChanged="u => { if (CurrentGroup.IntensityRange.Max < u) CurrentGroup.IntensityRange.Max = u; }"
-                                 OnSaveAction="_ => ConfigManager.SaveFnf()">
+                                 OnSaveAction="_ => ConfigManager.Save()">
                     Min Intensity: @CurrentGroup.IntensityRange.Min%
                 </DebouncedSlider>
 
                 <DebouncedSlider T="uint" Size="Size.Large" Min="0" Max="100" Class="openshock-slider-length" @bind-SliderValue="@CurrentGroup.IntensityRange.Max"
                                  OnValueChanged="u => { if (CurrentGroup.IntensityRange.Min > u) CurrentGroup.IntensityRange.Min = u; }"
-                                 OnSaveAction="_ => ConfigManager.SaveFnf()">
+                                 OnSaveAction="_ => ConfigManager.Save()">
                     Max Intensity: @CurrentGroup.IntensityRange.Max%
                 </DebouncedSlider>
             }
@@ -208,7 +208,7 @@
             @if (!CurrentGroup.RandomDuration)
             {
                 <DebouncedSlider T="uint" Size="Size.Large" Class="openshock-slider-length" @bind-SliderValue="@CurrentGroup.FixedDuration"
-                                 OnSaveAction="_ => ConfigManager.SaveFnf()"
+                                 OnSaveAction="_ => ConfigManager.Save()"
                                  Min="300" Max="30000" Step="100">
                     Duration: @MathF.Round(CurrentGroup.FixedDuration / 1000f, 1).ToString(CultureInfo.InvariantCulture)s
                 </DebouncedSlider>
@@ -217,14 +217,14 @@
             {
                 <DebouncedSlider T="uint" Size="Size.Large" Class="openshock-slider-length" @bind-SliderValue="@CurrentGroup.DurationRange.Min"
                                  OnValueChanged="u => { if (CurrentGroup.DurationRange.Max < u) CurrentGroup.DurationRange.Max = u; }"
-                                 OnSaveAction="_ => ConfigManager.SaveFnf()"
+                                 OnSaveAction="_ => ConfigManager.Save()"
                                  Min="300" Max="30000" Step="100">
                     Min Duration: @MathF.Round(CurrentGroup.DurationRange.Min / 1000f, 1).ToString(CultureInfo.InvariantCulture)s
                 </DebouncedSlider>
 
                 <DebouncedSlider T="uint" Size="Size.Large" Class="openshock-slider-length" @bind-SliderValue="@CurrentGroup.DurationRange.Max"
                                  OnValueChanged="u => { if (CurrentGroup.DurationRange.Min > u) CurrentGroup.DurationRange.Min = u; }"
-                                 OnSaveAction="_ => ConfigManager.SaveFnf()"
+                                 OnSaveAction="_ => ConfigManager.Save()"
                                  Min="300" Max="30000" Step="100">
                     Max Duration: @MathF.Round(CurrentGroup.DurationRange.Max / 1000f, 1).ToString(CultureInfo.InvariantCulture)s
                 </DebouncedSlider>

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/ShockersTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/ShockersTab.razor
@@ -31,9 +31,9 @@
 
 @code {
 
-    private Task OnShockerConfigUpdate()
+    private void OnShockerConfigUpdate()
     {
-        return ConfigManager.SaveAsync();
+        ConfigManager.Save();
     }
 
 }