Add case insensitive matching to Json serialization

Author: LauraWebdev

addons/deploy_to_steamos/SettingsManager.cs

@@ -20,7 +20,7 @@ public partial class SettingsManager : Node
 	public override void _EnterTree()
 	{
 		Instance = this;
-		
+
 		Load();
 	}
 
@@ -36,15 +36,16 @@ public void Load()
 			using var settingsFile = FileAccess.Open(SettingsPath, FileAccess.ModeFlags.Read);
 			var settingsFileContent = settingsFile.GetAsText();
 
-			Settings = JsonSerializer.Deserialize<SettingsFile>(settingsFileContent);
-			
+			Settings = JsonSerializer.Deserialize<SettingsFile>(settingsFileContent, DefaultSerializerOptions);
+
 			// Failsafe if settings file is corrupt
 			if (Settings == null)
 			{
 				Settings = new SettingsFile();
 				IsDirty = true;
 			}
 		}
+
 		if (!FileAccess.FileExists(SettingsPath))
 		{
 			Devices = new List<SteamOSDevkitManager.Device>();
@@ -55,8 +56,8 @@ public void Load()
 			using var devicesFile = FileAccess.Open(DevicesPath, FileAccess.ModeFlags.Read);
 			var devicesFileContent = devicesFile.GetAsText();
 
-			Devices = JsonSerializer.Deserialize<List<SteamOSDevkitManager.Device>>(devicesFileContent);
-			
+			Devices = JsonSerializer.Deserialize<List<SteamOSDevkitManager.Device>>(devicesFileContent, DefaultSerializerOptions);
+
 			// Failsafe if device file is corrupt
 			if (Devices == null)
 			{
@@ -79,17 +80,22 @@ public void Save()
 		{
 			DirAccess.MakeDirRecursiveAbsolute(FolderPath);
 		}
-		
+
 		// Save Settings
 		var jsonSettings = JsonSerializer.Serialize(Settings);
 		using var settingsFile = FileAccess.Open(SettingsPath, FileAccess.ModeFlags.Write);
 		settingsFile.StoreString(jsonSettings);
-		
+
 		// Save Devices
 		var jsonDevices = JsonSerializer.Serialize(Devices);
 		using var devicesFile = FileAccess.Open(DevicesPath, FileAccess.ModeFlags.Write);
 		devicesFile.StoreString(jsonDevices);
 
 		IsDirty = false;
 	}
+
+	public static readonly JsonSerializerOptions DefaultSerializerOptions = new JsonSerializerOptions
+	{
+		PropertyNameCaseInsensitive = true,
+	};
 }

addons/deploy_to_steamos/SteamOSDevkitManager.cs

@@ -144,7 +144,7 @@ public static async Task<PrepareUploadResult> PrepareUpload(Device device, strin
         logCallable.CallDeferred("Preparing upload");
 
         var resultRaw = await RunSSHCommand(device, "python3 ~/devkit-utils/steamos-prepare-upload --gameid " + gameId, logCallable);
-        var result = JsonSerializer.Deserialize<PrepareUploadResult>(resultRaw);
+        var result = JsonSerializer.Deserialize<PrepareUploadResult>(resultRaw, DefaultSerializerOptions);
 
         return result;
     }
@@ -162,7 +162,7 @@ public static async Task<CreateShortcutResult> CreateShortcut(Device device, Cre
         var command = $"python3 ~/devkit-utils/steam-client-create-shortcut --parms '{parametersJson}'";
 
         var resultRaw = await RunSSHCommand(device, command, logCallable);
-        var result = JsonSerializer.Deserialize<CreateShortcutResult>(resultRaw);
+        var result = JsonSerializer.Deserialize<CreateShortcutResult>(resultRaw, DefaultSerializerOptions);
 
         return result;
     }
@@ -243,4 +243,9 @@ public static ConnectionInfo GetSSHConnectionInfo(Device device)
         var privateKeyFile = new PrivateKeyFile(privateKeyPath);
         return new ConnectionInfo(device.IPAdress, device.Login, new PrivateKeyAuthenticationMethod(device.Login, privateKeyFile));
     }
+
+    public static readonly JsonSerializerOptions DefaultSerializerOptions = new JsonSerializerOptions
+    {
+        PropertyNameCaseInsensitive = true,
+    };
 }