update to GaldrJson, cleanup, minor bug fixes

Author: rthomasv3

Config.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Text.Json;
+using GaldrJson;
 using Microsoft.Win32;
 using Scum_Bag.DataAccess.Data;
 
@@ -11,6 +11,7 @@ internal sealed class Config
 {
     #region Fields
 
+    private readonly IGaldrJsonSerializer _jsonSerializer;
     private readonly string _dataDir;
     private readonly string _savesPath;
     private readonly string _latestScreenshotName;
@@ -23,8 +24,10 @@ internal sealed class Config
 
     #region Constructor
 
-    public Config()
+    public Config(IGaldrJsonSerializer jsonSerializer)
     {
+        _jsonSerializer = jsonSerializer;
+        
         _dataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Scum Bag");
         _backupsDirectory = _dataDir;
         _savesPath = Path.Combine(_dataDir, "saves.json");
@@ -95,7 +98,7 @@ public Settings GetSettings()
 
         if (File.Exists(_settingsPath))
         {
-            settings = JsonSerializer.Deserialize(File.ReadAllText(_settingsPath), SaveDataJsonSerializerContext.Default.Settings);
+            settings = _jsonSerializer.Deserialize<Settings>(File.ReadAllText(_settingsPath));
         }
 
         return settings;
@@ -105,7 +108,7 @@ public void SaveSettings(Settings settings)
     {
         _backupsDirectory = settings.BackupsDirectory;
         _steamExePath = settings.SteamExePath;
-        string settingsFileContent = JsonSerializer.Serialize(settings, SaveDataJsonSerializerContext.Default.Settings);
+        string settingsFileContent = _jsonSerializer.Serialize(settings);
         File.WriteAllText(_settingsPath, settingsFileContent);
     }
 
@@ -117,7 +120,7 @@ private void Initialize()
     {
         if (File.Exists(_settingsPath))
         {
-            Settings settings = JsonSerializer.Deserialize(File.ReadAllText(_settingsPath), SaveDataJsonSerializerContext.Default.Settings);
+            Settings settings = _jsonSerializer.Deserialize<Settings>(File.ReadAllText(_settingsPath));
             _backupsDirectory = settings.BackupsDirectory;
             _steamExePath = settings.SteamExePath;
         }
@@ -126,7 +129,7 @@ private void Initialize()
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                _steamExePath = Registry.CurrentUser.OpenSubKey("Software\\Valve\\Steam").GetValue("SteamExe").ToString();
+                _steamExePath = Registry.CurrentUser.OpenSubKey("Software\\Valve\\Steam")?.GetValue("SteamExe")?.ToString();
             }
             else
             {

DataAccess/Data/SaveGame.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using GaldrJson;
 
 namespace Scum_Bag.DataAccess.Data;
 
+[GaldrJsonSerializable]
 internal sealed class SaveGame
 {
     public Guid Id { get; set; }

DataAccess/Data/Settings.cs

@@ -1,5 +1,8 @@
+using GaldrJson;
+
 namespace Scum_Bag.DataAccess.Data;
 
+[GaldrJsonSerializable]
 internal sealed class Settings
 {
     public string Theme { get; set; }

Program.cs

@@ -14,22 +14,16 @@ internal class Program
     [STAThread]
     static void Main()
     {
-        Config config = new();
-        using LoggingService loggingService = new(config);
+        using LoggingService loggingService = new();
 
         try
         {
-            //if (!OperatingSystem.IsWindows())
-            //{
-            //    Galdr.Native.Generated.GaldrGeneratedInitializer.Initialize();
-            //}
-
             GaldrBuilder builder = new GaldrBuilder()
                 .SetTitle("Scum Bag - Save Manager")
                 .SetSize(1100, 775)
                 .SetMinSize(800, 600)
-                .AddSingleton(config)
                 .AddSingleton(loggingService)
+                .AddSingleton<Config>()
                 .AddSingleton<BackupService>()
                 .AddSingleton<GameService>()
                 .AddSingleton<SaveService>()
@@ -38,10 +32,6 @@ static void Main()
                 .AddSingleton<FileService>()
                 .AddSingleton<IShutterService, ShutterService>();
 #if DEBUG
-            //EmbeddedContent embeddedContent = new(embeddedNamespace: "Scum_Bag");
-            //builder.SetContentProvider(embeddedContent);
-            //builder.SetDebug(true);
-
             int port = 1314;
             UrlContent urlContent = new($"http://localhost:{port}");
             builder.SetContentProvider(urlContent);
@@ -51,7 +41,6 @@ static void Main()
             EmbeddedContent embeddedContent = new(embeddedNamespace: "Scum_Bag");
             builder.SetContentProvider(embeddedContent);
 #endif
-
             AddSaveGameCommands(builder);
             AddGameCommands(builder);
             AddDialogCommands(builder);

SaveDataJsonSerializerContext.cs

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Galdr.Native" Version="1.1.1" />
+    <PackageReference Include="Galdr.Native" Version="1.1.2" />
     <PackageReference Include="Gameloop.Vdf" Version="0.6.2" />
     <PackageReference Include="Shutter" Version="1.0.0" />
   </ItemGroup>

Scum Bag.csproj

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.Json;
 using System.Timers;
 using Galdr.Native;
+using GaldrJson;
 using Scum_Bag.DataAccess.Data;
 
 namespace Scum_Bag.Services;
@@ -20,19 +20,22 @@ internal sealed class BackupService
     private readonly ScreenshotService _screenshotService;
     private readonly Dictionary<Guid, Timer> _backupTimers = new();
     private readonly Dictionary<Guid, ElapsedEventHandler> _backupTimerEvents = new();
+    private readonly IGaldrJsonSerializer _jsonSerializer;
 
     #endregion
 
     #region Constructor
 
     public BackupService(Config config, EventService eventService, LoggingService loggingService, 
-        FileService fileService, ScreenshotService screenshotService)
+        FileService fileService, ScreenshotService screenshotService, 
+        IGaldrJsonSerializer jsonSerializer)
     {
         _config = config;
         _eventService = eventService;
         _loggingService = loggingService;
         _fileService = fileService;
         _screenshotService = screenshotService;
+        _jsonSerializer = jsonSerializer;
 
         Initialize();
     }
@@ -252,7 +255,7 @@ private bool CreateBackup(Guid id)
 
                         // actual count is dirs length + 1 because a new backup was just made,
                         // and don't count any favorites toward the max backups
-                        int totalBackups = dirs.Length + 1 - saveGame.BackupMetadata.Where(x => x.Value.IsFavorite).Count();
+                        int totalBackups = dirs.Length + 1 - saveGame.BackupMetadata?.Where(x => x.Value.IsFavorite)?.Count() ?? 0;
 
                         while (totalBackups > saveGame.MaxBackups)
                         {
@@ -286,7 +289,7 @@ private void DeleteOldestBackup(SaveGame saveGame)
             {
                 bool isFavorite = false;
 
-                if (saveGame.BackupMetadata.TryGetValue(dir.FullName, out BackupMetadata backupMetadata))
+                if (saveGame.BackupMetadata?.TryGetValue(dir.FullName, out BackupMetadata backupMetadata) == true)
                 {
                     isFavorite = backupMetadata.IsFavorite;
                 }
@@ -318,7 +321,7 @@ private List<SaveGame> GetSaveGames()
 
         try
         {
-            saveGames = JsonSerializer.Deserialize(File.ReadAllText(_config.SavesPath), SaveDataJsonSerializerContext.Default.ListSaveGame);
+            saveGames = _jsonSerializer.Deserialize<List<SaveGame>>(File.ReadAllText(_config.SavesPath));
         }
         catch (Exception e)
         {

Services/BackupService.cs

@@ -18,9 +18,9 @@ internal sealed class LoggingService : IDisposable
 
     #region Constructor
 
-    public LoggingService(Config config)
+    public LoggingService()
     {
-        _logFileLocation = Path.Combine(config.DataDirectory, "logs.txt");
+        _logFileLocation = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Scum Bag", "logs.txt");
         _logQueue = new();
         _logQueueTokenSource = new();