json source generation

Author: SimonCropp

src/DiffEngineTray/AppJsonContext.cs

@@ -0,0 +1,5 @@
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(MovePayload))]
+[JsonSerializable(typeof(DeletePayload))]
+[JsonSerializable(typeof(Settings))]
+partial class AppJsonContext : JsonSerializerContext;

src/DiffEngineTray/AssemblyLocation.cs

@@ -1,17 +1,4 @@
 static class AssemblyLocation
 {
-    static AssemblyLocation()
-    {
-        var assembly = typeof(AssemblyLocation).Assembly;
-
-        var path = assembly.Location
-            .Replace("file:///", "")
-            .Replace("file://", "")
-            .Replace(@"file:\\\", "")
-            .Replace(@"file:\\", "");
-
-        CurrentDirectory = Path.GetDirectoryName(path)!;
-    }
-
-    public static readonly string CurrentDirectory;
-}
+    public static readonly string CurrentDirectory = AppContext.BaseDirectory;
+}

src/DiffEngineTray/GlobalUsings.cs

@@ -3,4 +3,5 @@
 global using Serilog;
 global using System.Text.Json;
 global using System.Text.Json.Serialization;
+global using System.Text.Json.Serialization.Metadata;
 global using System.Diagnostics.CodeAnalysis;

src/DiffEngineTray/PiperServer.cs

@@ -63,12 +63,12 @@ static async Task Handle(TcpListener listener, Action<MovePayload> move, Action<
             if (payload.Contains("\"Type\":\"Move\"") ||
                 payload.Contains("\"Type\": \"Move\""))
             {
-                move(Serializer.Deserialize<MovePayload>(payload));
+                move(Serializer.Deserialize(payload, AppJsonContext.Default.MovePayload));
             }
             else if (payload.Contains("\"Type\":\"Delete\"") ||
                      payload.Contains("\"Type\": \"Delete\""))
             {
-                delete(Serializer.Deserialize<DeletePayload>(payload));
+                delete(Serializer.Deserialize(payload, AppJsonContext.Default.DeletePayload));
             }
             else
             {

src/DiffEngineTray/Serializer.cs

@@ -1,10 +1,10 @@
-static class Serializer
+static class Serializer
 {
-    public static T Deserialize<T>(string payload)
+    public static T Deserialize<T>(string payload, JsonTypeInfo<T> jsonTypeInfo)
     {
         try
         {
-            return JsonSerializer.Deserialize<T>(payload)!;
+            return JsonSerializer.Deserialize(payload, jsonTypeInfo)!;
         }
         catch (Exception exception)
         {
@@ -16,4 +16,4 @@ public static T Deserialize<T>(string payload)
                 exception);
         }
     }
-}
+}

src/DiffEngineTray/Settings/SettingsHelper.cs

@@ -16,7 +16,7 @@ public static async Task<Settings> Read()
         if (File.Exists(FilePath))
         {
             await using var stream = File.OpenRead(FilePath);
-            settings = (await JsonSerializer.DeserializeAsync<Settings>(stream))!;
+            settings = (await JsonSerializer.DeserializeAsync(stream, AppJsonContext.Default.Settings))!;
         }
         else
         {
@@ -35,6 +35,6 @@ public static async Task Write(Settings settings)
         MaxInstance.SetForUser(settings.MaxInstancesToLaunch);
         File.Delete(FilePath);
         await using var stream = File.OpenWrite(FilePath);
-        await JsonSerializer.SerializeAsync(stream, settings);
+        await JsonSerializer.SerializeAsync(stream, settings, AppJsonContext.Default.Settings);
     }
 }