🥁 Reinstate STJ source generation

This reverts commit 37785dd.

Author: database64128

YoutubeDl.Wpf/Models/Settings.cs

@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text.Encodings.Web;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using YoutubeDl.Wpf.Utils;
@@ -145,23 +143,14 @@ public class Settings
     /// </remarks>
     public List<string> CookiesBrowserArgHistory { get; set; } = [];
 
-    private static readonly JsonSerializerOptions s_jsonSerializerOptions = new()
-    {
-        AllowTrailingCommas = true,
-        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-        IgnoreReadOnlyProperties = true,
-        ReadCommentHandling = JsonCommentHandling.Skip,
-        WriteIndented = true,
-    };
-
     /// <summary>
     /// Loads settings from Settings.json.
     /// </summary>
     /// <param name="cancellationToken">A token that may be used to cancel the read operation.</param>
     /// <returns>The <see cref="Settings"/> object.</returns>
     public static async Task<Settings> LoadAsync(CancellationToken cancellationToken = default)
     {
-        Settings settings = await FileHelper.LoadFromJsonFileAsync<Settings>("Settings.json", s_jsonSerializerOptions, cancellationToken).ConfigureAwait(false);
+        Settings settings = await FileHelper.LoadFromJsonFileAsync("Settings.json", SettingsJsonSerializerContext.Default.Settings, cancellationToken).ConfigureAwait(false);
         settings.Update();
         settings.Validate();
         return settings;
@@ -173,7 +162,7 @@ public static async Task<Settings> LoadAsync(CancellationToken cancellationToken
     /// <param name="cancellationToken">A token that may be used to cancel the write operation.</param>
     /// <returns>A task that represents the asynchronous write operation.</returns>
     public Task SaveAsync(CancellationToken cancellationToken = default)
-        => FileHelper.SaveToJsonFileAsync("Settings.json", this, s_jsonSerializerOptions, cancellationToken);
+        => FileHelper.SaveToJsonFileAsync("Settings.json", this, SettingsJsonSerializerContext.Default.Settings, cancellationToken);
 
     /// <summary>
     /// Updates settings to the latest version.

YoutubeDl.Wpf/Models/SettingsJsonSerializerContext.cs

@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace YoutubeDl.Wpf.Models;
+
+[JsonSerializable(typeof(Settings))]
+[JsonSourceGenerationOptions(
+    IgnoreReadOnlyProperties = true,
+    WriteIndented = true)]
+public partial class SettingsJsonSerializerContext : JsonSerializerContext
+{
+}

YoutubeDl.Wpf/Utils/FileHelper.cs

@@ -28,26 +28,6 @@ public static class FileHelper
         }
     }
 
-    /// <summary>
-    /// Loads the specified JSON file and deserializes its content as a <typeparamref name="TValue"/>.
-    /// </summary>
-    /// <typeparam name="TValue">The type to deserialize the JSON value into.</typeparam>
-    /// <param name="path">JSON file path.</param>
-    /// <param name="jsonSerializerOptions">Deserialization options.</param>
-    /// <param name="cancellationToken">A token that may be used to cancel the read operation.</param>
-    /// <returns>A <typeparamref name="TValue"/>.</returns>
-    public static async Task<TValue> LoadFromJsonFileAsync<TValue>(string path, JsonSerializerOptions? jsonSerializerOptions = null, CancellationToken cancellationToken = default) where TValue : class, new()
-    {
-        if (!File.Exists(path))
-            return new();
-
-        var fileStream = new FileStream(path, FileMode.Open);
-        await using (fileStream.ConfigureAwait(false))
-        {
-            return await JsonSerializer.DeserializeAsync<TValue>(fileStream, jsonSerializerOptions, cancellationToken).ConfigureAwait(false) ?? new();
-        }
-    }
-
     /// <summary>
     /// Serializes the provided value as JSON and saves to the specified file.
     /// </summary>
@@ -76,33 +56,4 @@ public static async Task SaveToJsonFileAsync<TValue>(
         if (canReplace)
             File.Replace(newPath, path, $"{path}.old");
     }
-
-    /// <summary>
-    /// Serializes the provided value as JSON and saves to the specified file.
-    /// </summary>
-    /// <typeparam name="TValue">The type of the value to serialize.</typeparam>
-    /// <param name="path">JSON file path.</param>
-    /// <param name="value">The value to save.</param>
-    /// <param name="jsonSerializerOptions">Serialization options.</param>
-    /// <param name="cancellationToken">A token that may be used to cancel the write operation.</param>
-    /// <returns>A task that represents the asynchronous write operation.</returns>
-    public static async Task SaveToJsonFileAsync<TValue>(
-        string path,
-        TValue value,
-        JsonSerializerOptions? jsonSerializerOptions = null,
-        CancellationToken cancellationToken = default)
-    {
-        // File.Replace throws an exception when the destination file does not exist.
-        var canReplace = File.Exists(path);
-        var newPath = canReplace ? $"{path}.new" : path;
-        var fileStream = new FileStream(newPath, FileMode.Create);
-
-        await using (fileStream.ConfigureAwait(false))
-        {
-            await JsonSerializer.SerializeAsync(fileStream, value, jsonSerializerOptions, cancellationToken);
-        }
-
-        if (canReplace)
-            File.Replace(newPath, path, $"{path}.old");
-    }
 }