Skip to content

Commit a83899b

Browse files
committed
pass JsonSerializerContext do Serialize/Deserialize
1 parent 9670845 commit a83899b

5 files changed

Lines changed: 17 additions & 8 deletions

File tree

Project-Aurora/AuroraDeviceManager/Utils/SourceGenerationContext.cs renamed to Project-Aurora/AuroraCommon/Devices/DevicesJsonContext.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
using Common.Devices;
33
using Common.Devices.RGBNet;
44

5-
namespace AuroraDeviceManager.Utils;
5+
namespace Common.Utils;
66

7-
[JsonSourceGenerationOptions(WriteIndented = false)]
7+
[JsonSourceGenerationOptions(WriteIndented = true)]
88
[JsonSerializable(typeof(DeviceConfig))]
99
[JsonSerializable(typeof(CurrentDevices))]
1010
[JsonSerializable(typeof(DeviceMappingConfig))]
1111
[JsonSerializable(typeof(VariableRegistryItem))]
12-
public partial class SourceGenerationContext : JsonSerializerContext;
12+
public partial class DevicesJsonContext : JsonSerializerContext;

Project-Aurora/AuroraDeviceManager/ConfigManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private async Task<DeviceConfig> CreateDefaultConfigurationFile()
9696

9797
var varRegistryVariables = auroraConfig.VarRegistry.Variables
9898
.Where(pair => pair.Value.GetValueKind() == JsonValueKind.Object)
99-
.ToDictionary(pair => pair.Key, pair => pair.Value.Deserialize(SourceGenerationContext.Default.VariableRegistryItem)!);
99+
.ToDictionary(pair => pair.Key, pair => pair.Value.Deserialize(DevicesJsonContext.Default.VariableRegistryItem)!);
100100

101101
var migratedConfig = new DeviceConfig
102102
{

Project-Aurora/AuroraDeviceManager/Devices/DeviceManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Common.Data;
99
using Common.Devices;
1010
using Common.Devices.RGBNet;
11+
using Common.Utils;
1112
using Microsoft.Win32;
1213
using RGB.NET.Core;
1314
using RgbNetColor = RGB.NET.Core.Color;
@@ -236,7 +237,7 @@ from device in rgbNetController.DeviceList
236237

237238
var currentDevices = new CurrentDevices(remappableDevices);
238239

239-
var json = JsonSerializer.Serialize(currentDevices, SourceGenerationContext.Default.CurrentDevices);
240+
var json = JsonSerializer.Serialize(currentDevices, DevicesJsonContext.Default.CurrentDevices);
240241
var command = DeviceCommands.RemappableDevices + Constants.StringSplit + json;
241242

242243
await SendCommand(command);

Project-Aurora/Project-Aurora/Settings/ConfigManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public static void Save(IAuroraConfig configuration)
201201

202202
LastSaveTimes[path] = currentTime;
203203

204-
var content = JsonSerializer.Serialize(configuration);
204+
var content = JsonSerializer.Serialize(configuration, DevicesJsonContext.Default.GetTypeInfo(configuration.GetType()));
205205

206206
Directory.CreateDirectory(Path.GetDirectoryName(path));
207207
File.WriteAllText(path, content, Encoding.UTF8);
@@ -216,7 +216,7 @@ public static async Task SaveAsync(IAuroraConfig configuration)
216216

217217
LastSaveTimes[path] = currentTime;
218218

219-
var content = JsonSerializer.Serialize(configuration);
219+
var content = JsonSerializer.Serialize(configuration, DevicesJsonContext.Default.GetTypeInfo(configuration.GetType()));
220220

221221
Directory.CreateDirectory(Path.GetDirectoryName(path));
222222
await File.WriteAllTextAsync(path, content, Encoding.UTF8);
@@ -253,7 +253,7 @@ public static async Task<SensitiveData> LoadSensitiveData()
253253

254254
public static void SaveSensitiveData()
255255
{
256-
var content = JsonSerializer.Serialize(Global.SensitiveData);
256+
var content = JsonSerializer.Serialize(Global.SensitiveData, SettingsJsonContext.Default.SensitiveData);
257257
var encryptedContent = Encryption.Encrypt(content);
258258
File.WriteAllBytes(SensitiveData.ConfigFile, encryptedContent);
259259
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
using System.Text.Json.Serialization;
3+
using AuroraRgb.Settings;
4+
5+
6+
[JsonSourceGenerationOptions(WriteIndented = true)]
7+
[JsonSerializable(typeof(SensitiveData))]
8+
public partial class SettingsJsonContext : JsonSerializerContext;

0 commit comments

Comments
 (0)