Use compile-time serialization for settings

Tyrrrz · May 22, 2024 · 0e3969c · 0e3969c
1 parent 91b7486
commit 0e3969c
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 21 deletions.
diff --git a/DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj b/DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj
@@ -20,7 +20,7 @@
  <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
  <PackageReference Include="xunit" Version="2.8.0" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="all" />
  </ItemGroup>

diff --git a/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj b/DiscordChatExporter.Core/DiscordChatExporter.Core.csproj
@@ -9,7 +9,7 @@
  <PackageReference Include="RazorBlade" Version="0.6.0" />
  <PackageReference Include="Superpower" Version="3.0.0" />
  <PackageReference Include="WebMarkupMin.Core" Version="2.16.0" />
- <PackageReference Include="YoutubeExplode" Version="6.3.14" />
+ <PackageReference Include="YoutubeExplode" Version="6.3.16" />
  </ItemGroup>
 
 </Project>
diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -5,7 +5,6 @@
  <AssemblyName>DiscordChatExporter</AssemblyName>
  <ApplicationIcon>..\favicon.ico</ApplicationIcon>
  <PublishTrimmed>true</PublishTrimmed>
- <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
  <NoWarn>$(NoWarn);IL2104</NoWarn>
  </PropertyGroup>
 
@@ -27,7 +26,7 @@
  <PackageReference Include="Avalonia" Version="11.0.10" />
  <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
  <PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" Condition="'$(Configuration)' == 'Debug'" />
- <PackageReference Include="Cogwheel" Version="2.0.4" />
+ <PackageReference Include="Cogwheel" Version="2.1.0" />
  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
  <PackageReference Include="CSharpier.MsBuild" Version="0.28.2" PrivateAssets="all" />
  <PackageReference Include="Deorcify" Version="1.0.2" PrivateAssets="all" />

diff --git a/DiscordChatExporter.Gui/Services/SettingsService.cs b/DiscordChatExporter.Gui/Services/SettingsService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text.Json.Serialization;
 using Cogwheel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DiscordChatExporter.Core.Exporting;
@@ -8,57 +9,126 @@
 
 namespace DiscordChatExporter.Gui.Services;
 
+// Can't use [ObservableProperty] here because System.Text.Json's source generator doesn't see
+// the generated properties.
 [INotifyPropertyChanged]
 public partial class SettingsService()
- : SettingsBase(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Settings.dat"))
+ : SettingsBase(
+ Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Settings.dat"),
+ SerializerContext.Default
+ )
 {
- [ObservableProperty]
  private bool _isUkraineSupportMessageEnabled = true;
+ public bool IsUkraineSupportMessageEnabled
+ {
+ get => _isUkraineSupportMessageEnabled;
+ set => SetProperty(ref _isUkraineSupportMessageEnabled, value);
+ }
 
- [ObservableProperty]
  private ThemeVariant _theme;
+ public ThemeVariant Theme
+ {
+ get => _theme;
+ set => SetProperty(ref _theme, value);
+ }
 
- [ObservableProperty]
  private bool _isAutoUpdateEnabled = true;
+ public bool IsAutoUpdateEnabled
+ {
+ get => _isAutoUpdateEnabled;
+ set => SetProperty(ref _isAutoUpdateEnabled, value);
+ }
 
- [ObservableProperty]
  private bool _isTokenPersisted = true;
+ public bool IsTokenPersisted
+ {
+ get => _isTokenPersisted;
+ set => SetProperty(ref _isTokenPersisted, value);
+ }
 
- [ObservableProperty]
  private ThreadInclusionMode _threadInclusionMode;
+ public ThreadInclusionMode ThreadInclusionMode
+ {
+ get => _threadInclusionMode;
+ set => SetProperty(ref _threadInclusionMode, value);
+ }
 
- [ObservableProperty]
  private string? _locale;
+ public string? Locale
+ {
+ get => _locale;
+ set => SetProperty(ref _locale, value);
+ }
 
- [ObservableProperty]
  private bool _isUtcNormalizationEnabled;
+ public bool IsUtcNormalizationEnabled
+ {
+ get => _isUtcNormalizationEnabled;
+ set => SetProperty(ref _isUtcNormalizationEnabled, value);
+ }
 
- [ObservableProperty]
  private int _parallelLimit = 1;
+ public int ParallelLimit
+ {
+ get => _parallelLimit;
+ set => SetProperty(ref _parallelLimit, value);
+ }
 
- [ObservableProperty]
  private string? _lastToken;
+ public string? LastToken
+ {
+ get => _lastToken;
+ set => SetProperty(ref _lastToken, value);
+ }
 
- [ObservableProperty]
  private ExportFormat _lastExportFormat = ExportFormat.HtmlDark;
+ public ExportFormat LastExportFormat
+ {
+ get => _lastExportFormat;
+ set => SetProperty(ref _lastExportFormat, value);
+ }
 
- [ObservableProperty]
  private string? _lastPartitionLimitValue;
+ public string? LastPartitionLimitValue
+ {
+ get => _lastPartitionLimitValue;
+ set => SetProperty(ref _lastPartitionLimitValue, value);
+ }
 
- [ObservableProperty]
  private string? _lastMessageFilterValue;
+ public string? LastMessageFilterValue
+ {
+ get => _lastMessageFilterValue;
+ set => SetProperty(ref _lastMessageFilterValue, value);
+ }
 
- [ObservableProperty]
  private bool _lastShouldFormatMarkdown = true;
+ public bool LastShouldFormatMarkdown
+ {
+ get => _lastShouldFormatMarkdown;
+ set => SetProperty(ref _lastShouldFormatMarkdown, value);
+ }
 
- [ObservableProperty]
  private bool _lastShouldDownloadAssets;
+ public bool LastShouldDownloadAssets
+ {
+ get => _lastShouldDownloadAssets;
+ set => SetProperty(ref _lastShouldDownloadAssets, value);
+ }
 
- [ObservableProperty]
  private bool _lastShouldReuseAssets;
+ public bool LastShouldReuseAssets
+ {
+ get => _lastShouldReuseAssets;
+ set => SetProperty(ref _lastShouldReuseAssets, value);
+ }
 
- [ObservableProperty]
  private string? _lastAssetsDirPath;
+ public string? LastAssetsDirPath
+ {
+ get => _lastAssetsDirPath;
+ set => SetProperty(ref _lastAssetsDirPath, value);
+ }
 
  public override void Save()
  {
@@ -72,3 +142,9 @@ public override void Save()
  LastToken = lastToken;
  }
 }
+
+public partial class SettingsService
+{
+ [JsonSerializable(typeof(SettingsService))]
+ private partial class SerializerContext : JsonSerializerContext;
+}