Merge pull request #190 from davidwengier/SaveTweaks

Author: davidwengier

src/BlazingTrains/BlazingTrains.csproj

@@ -17,7 +17,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorBeforeUnload" Version="1.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0-rc.2.21480.10" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0-rc.2.21480.10" PrivateAssets="all" />
 

src/BlazingTrains/BlazorGameStorage.cs

@@ -5,17 +5,25 @@ namespace BlazingTrains;
 
 public class BlazorGameStorage : IGameStorage
 {
+    private ISyncLocalStorageService? _syncLocalStorageService;
+    private readonly Dictionary<string, string> _lastSavedValue = new Dictionary<string, string>();
+
     public IServiceProvider? AspNetCoreServices { get; set; }
 
-    private ISyncLocalStorageService? SyncLocalStorageService => this.AspNetCoreServices?.GetService<ISyncLocalStorageService>();
+    private ISyncLocalStorageService? SyncLocalStorageService
+    {
+        get
+        {
+            return (_syncLocalStorageService ??= this.AspNetCoreServices?.GetService<ISyncLocalStorageService>());
+        }
+    }
 
     public string? Read(string key)
     {
         var data = this.SyncLocalStorageService?.GetItemAsString(key);
         return data;
     }
 
-    private readonly Dictionary<string, string> _lastSavedValue = new Dictionary<string, string>();
     public void Write(string key, string value)
     {
         var valueExists = _lastSavedValue.TryGetValue(key, out var previousValue);

src/BlazingTrains/BlazorTimer.cs

@@ -17,7 +17,7 @@ public class BlazorTimer : ITimer
 
     public void Dispose()
     {
-        throw new NotImplementedException();
+        Stop();
     }
 
     public void Start()

src/BlazingTrains/Commands/ChangeSaveModeCommand.cs

@@ -3,9 +3,6 @@
 @using SkiaSharp.Views.Blazor
 @using Trains.NET.Rendering
 @using Trains.NET.Rendering.Skia
-@using blazejewicz.Blazor.BeforeUnload
-@inject BeforeUnload BeforeUnload
-@implements IDisposable
 
 <PageTitle>Trains - @@davidwengier - @ThisAssembly.AssemblyInformationalVersion</PageTitle>
 

src/BlazingTrains/Pages/Index.razor

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Components.Web;
 using SkiaSharp;
 using SkiaSharp.Views.Blazor;
-using Trains.NET.Engine;
 using Trains.NET.Instrumentation;
 using Trains.NET.Rendering;
 using Trains.NET.Rendering.Skia;
@@ -22,8 +21,6 @@ protected override async Task OnInitializedAsync()
         _interactionManager = DI.ServiceLocator.GetService<IInteractionManager>();
 
         await _game.InitializeAsync(200, 200);
-
-        this.BeforeUnload.BeforeUnloadHandler += BeforeUnload_BeforeUnloadHandler;
     }
 
     private void OnPaintSurface(SKPaintGLSurfaceEventArgs e)
@@ -114,15 +111,4 @@ private void OnMouseWheel(WheelEventArgs e)
             _interactionManager.PointerZoomOut((int)e.ClientX, (int)e.ClientY);
         }
     }
-
-    private void BeforeUnload_BeforeUnloadHandler(object? sender, blazejewicz.Blazor.BeforeUnload.BeforeUnloadArgs e)
-    {
-        DI.ServiceLocator.GetService<IGameStateManager>().Save();
-        _game.Dispose();
-    }
-
-    public void Dispose()
-    {
-        this.BeforeUnload.BeforeUnloadHandler -= BeforeUnload_BeforeUnloadHandler;
-    }
 }

src/BlazingTrains/Pages/Index.razor.cs

@@ -8,7 +8,6 @@
 builder.RootComponents.Add<App>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");
 
-builder.Services.AddBeforeUnload();
 builder.Services.AddBlazoredLocalStorage();
 builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 

src/BlazingTrains/Program.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Trains.NET.Engine.Utilities;
 using Trains.NET.Instrumentation;
 
 namespace Trains.NET.Engine;
@@ -15,7 +14,6 @@ public class GameManager : IGameManager, IInitializeAsync
     private ITool _currentTool;
     private readonly ITool _defaultTool;
     private readonly ITimer _gameLoopTimer;
-    private readonly IGameStateManager _gameStateManager;
     private readonly IEnumerable<IGameStep> _gameSteps;
     private readonly ElapsedMillisecondsTimedStat _gameUpdateTime = InstrumentationBag.Add<ElapsedMillisecondsTimedStat>("Game-LoopStepTime");
 
@@ -44,7 +42,7 @@ public ITool CurrentTool
         }
     }
 
-    public GameManager(IEnumerable<ITool> tools, IEnumerable<IGameStep> gameSteps, ITimer timer, IGameStateManager gameStateManager)
+    public GameManager(IEnumerable<ITool> tools, IEnumerable<IGameStep> gameSteps, ITimer timer)
     {
         _defaultTool = tools.First();
         _currentTool = _defaultTool;
@@ -54,7 +52,6 @@ public GameManager(IEnumerable<ITool> tools, IEnumerable<IGameStep> gameSteps, I
 
         _gameLoopTimer.Interval = GameLoopInterval;
         _gameLoopTimer.Elapsed += GameLoopTimerElapsed;
-        _gameStateManager = gameStateManager;
     }
 
     public Task InitializeAsync(int columns, int rows)
@@ -74,8 +71,6 @@ public void GameLoopStep()
             foreach (var gameStep in _gameSteps)
             {
                 gameStep.Update(timeSinceLastTick);
-                if (_gameStateManager.SaveMode == SaveModes.GameStep)
-                    _gameStateManager.Save();
             }
         }
     }

src/Trains.NET.Engine/GamePlay/GameManager.cs

@@ -1,45 +1,58 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Trains.NET.Engine.Utilities;
 using Trains.NET.Instrumentation;
 using Trains.NET.Instrumentation.Stats;
 
 namespace Trains.NET.Engine;
 
 [Order(999999)]
-public class GameStateManager : IGameStateManager, IInitializeAsync
+public class GameStateManager : IGameStateManager, IInitializeAsync, IGameStep
 {
+    // Auto-save every 2 seconds
+    private const int AutosaveInterval = 2 * 60;
+
+    private int _autosaveCounter;
+    private bool _autosaveEnabled;
+
     private readonly IEnumerable<IGameState> _gameStates;
     private readonly IGameStorage _storage;
-    private readonly ITimer _timer;
-    private readonly InformationStat _saveModeStat = InstrumentationBag.Add<InformationStat>("Save-Mode");
+    private readonly InformationStat _autosaveStat = InstrumentationBag.Add<InformationStat>("Autosave");
     private readonly ElapsedMillisecondsTimedStat _saveTimeStat = InstrumentationBag.Add<ElapsedMillisecondsTimedStat>("Save-Time");
 
-    public SaveModes SaveMode { get; private set; }
+    public bool AutosaveEnabled
+    {
+        get { return _autosaveEnabled; }
+        set
+        {
+            _autosaveEnabled = value;
+            if (_autosaveEnabled)
+            {
+                _autosaveCounter = 0;
+                Save();
+            }
+            else
+            {
+                // if they're turning off autosave, we want to at least save that
+                // otherwise if they leave before the next save, it could be back on
+                // on load
+                _storage.Write("Autosave", this.AutosaveEnabled.ToString());
+            }
+        }
+    }
 
-    public GameStateManager(IEnumerable<IGameState> gameStates, IGameStorage storage, ITimer timer)
+    public GameStateManager(IEnumerable<IGameState> gameStates, IGameStorage storage)
     {
         _gameStates = gameStates;
         _storage = storage;
-        _timer = timer;
-        _saveModeStat.Information = $"{this.SaveMode}";
     }
 
     public Task InitializeAsync(int columns, int rows)
     {
         Load();
 
-        _timer.Interval = 1000;
-        _timer.Elapsed += _timer_Elapsed;
-
         return Task.CompletedTask;
     }
 
-    private void _timer_Elapsed(object? sender, System.EventArgs e)
-    {
-        Save();
-    }
-
     public void Load()
     {
         foreach (var gameState in _gameStates)
@@ -51,6 +64,7 @@ public void Load()
                 break;
             }
         }
+        this.AutosaveEnabled = _storage.Read("Autosave")?.Equals("True") ?? true;
     }
 
     public void Reset()
@@ -69,22 +83,19 @@ public void Save()
             {
                 gameState.Save(_storage);
             }
+            _storage.Write("Autosave", this.AutosaveEnabled.ToString());
         }
     }
 
-    public void ChangeSaveMode()
+    public void Update(long timeSinceLastTick)
     {
-        this.SaveMode = this.SaveMode switch
+        _autosaveStat.Information = this.AutosaveEnabled ? "On" : "Off";
+
+        if (this.AutosaveEnabled &&
+            ++_autosaveCounter > AutosaveInterval)
         {
-            SaveModes.Manual => SaveModes.GameStep,
-            SaveModes.GameStep => SaveModes.Timer,
-            SaveModes.Timer => SaveModes.Manual,
-            _ => SaveModes.Manual
-        };
-        _saveModeStat.Information = $"{this.SaveMode}";
-        if (this.SaveMode == SaveModes.Timer)
-            _timer.Start();
-        else
-            _timer.Stop();
+            Save();
+            _autosaveCounter = 0;
+        }
     }
 }

src/Trains.NET.Engine/GameState/GameStateManager.cs

@@ -1,13 +1,10 @@
-using Trains.NET.Engine.Utilities;
-
-namespace Trains.NET.Engine;
+namespace Trains.NET.Engine;
 
 public interface IGameStateManager
 {
-    SaveModes SaveMode { get; }
+    bool AutosaveEnabled { get; set; }
 
     void Load();
     void Save();
     void Reset();
-    void ChangeSaveMode();
 }