Skip to content

Commit 4736bc6

Browse files
committed
fix: added usings, simplified imports, using JsonElement.Deserialize directly instead of JsonSerializer.Deserialize(JsonElement), removed some unused attributes
1 parent 18b1317 commit 4736bc6

31 files changed

+65
-60
lines changed

src/ElectronNET.API/API/ApiBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace ElectronNET.API
22
{
3+
using ElectronNET.API.Serialization;
34
using ElectronNET.Common;
45
using System;
56
using System.Collections.Concurrent;
@@ -159,7 +160,7 @@ public PropertyGetter(ApiBase apiBase, string callerName, int timeoutMs)
159160
{
160161
try
161162
{
162-
var value = JsonSerializer.Deserialize<T>(result, Serialization.ElectronJson.Options);
163+
var value = result.Deserialize<T>(ElectronJson.Options);
163164
this.tcs?.SetResult(value);
164165
}
165166
catch (Exception ex)

src/ElectronNET.API/API/App.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ElectronNET.API.Entities;
22
using ElectronNET.API.Extensions;
3+
using ElectronNET.API.Serialization;
34
using ElectronNET.Common;
45
using System;
56
using System.Runtime.InteropServices;
@@ -1188,7 +1189,7 @@ public async Task<LoginItemSettings> GetLoginItemSettingsAsync(LoginItemSettings
11881189
{
11891190
BridgeConnector.Socket.Off("appGetLoginItemSettingsCompleted");
11901191

1191-
var result = JsonSerializer.Deserialize<LoginItemSettings>(loginItemSettings, Serialization.ElectronJson.Options);
1192+
var result = loginItemSettings.Deserialize<LoginItemSettings>(ElectronJson.Options);
11921193

11931194
taskCompletionSource.SetResult(result);
11941195
});

src/ElectronNET.API/API/AutoUpdater.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public event Action OnCheckingForUpdate
310310
/// </summary>
311311
public event Action<UpdateInfo> OnUpdateAvailable
312312
{
313-
add => ApiEventManager.AddEvent("autoUpdater-update-available", GetHashCode(), _updateAvailable, value, (args) => JsonSerializer.Deserialize(args, ElectronJsonContext.Default.UpdateInfo));
313+
add => ApiEventManager.AddEvent("autoUpdater-update-available", GetHashCode(), _updateAvailable, value, (args) => args.Deserialize(ElectronJsonContext.Default.UpdateInfo));
314314
remove => ApiEventManager.RemoveEvent("autoUpdater-update-available", GetHashCode(), _updateAvailable, value);
315315
}
316316

@@ -321,7 +321,7 @@ public event Action<UpdateInfo> OnUpdateAvailable
321321
/// </summary>
322322
public event Action<UpdateInfo> OnUpdateNotAvailable
323323
{
324-
add => ApiEventManager.AddEvent("autoUpdater-update-not-available", GetHashCode(), _updateNotAvailable, value, (args) => JsonSerializer.Deserialize(args, ElectronJsonContext.Default.UpdateInfo));
324+
add => ApiEventManager.AddEvent("autoUpdater-update-not-available", GetHashCode(), _updateNotAvailable, value, (args) => args.Deserialize(ElectronJsonContext.Default.UpdateInfo));
325325
remove => ApiEventManager.RemoveEvent("autoUpdater-update-not-available", GetHashCode(), _updateNotAvailable, value);
326326
}
327327

@@ -332,7 +332,7 @@ public event Action<UpdateInfo> OnUpdateNotAvailable
332332
/// </summary>
333333
public event Action<ProgressInfo> OnDownloadProgress
334334
{
335-
add => ApiEventManager.AddEvent("autoUpdater-download-progress", GetHashCode(), _downloadProgress, value, (args) => JsonSerializer.Deserialize(args, ElectronJsonContext.Default.ProgressInfo));
335+
add => ApiEventManager.AddEvent("autoUpdater-download-progress", GetHashCode(), _downloadProgress, value, (args) => args.Deserialize(ElectronJsonContext.Default.ProgressInfo));
336336
remove => ApiEventManager.RemoveEvent("autoUpdater-download-progress", GetHashCode(), _downloadProgress, value);
337337
}
338338

@@ -343,7 +343,7 @@ public event Action<ProgressInfo> OnDownloadProgress
343343
/// </summary>
344344
public event Action<UpdateInfo> OnUpdateDownloaded
345345
{
346-
add => ApiEventManager.AddEvent("autoUpdater-update-downloaded", GetHashCode(), _updateDownloaded, value, (args) => JsonSerializer.Deserialize(args, ElectronJsonContext.Default.UpdateInfo));
346+
add => ApiEventManager.AddEvent("autoUpdater-update-downloaded", GetHashCode(), _updateDownloaded, value, (args) => args.Deserialize(ElectronJsonContext.Default.UpdateInfo));
347347
remove => ApiEventManager.RemoveEvent("autoUpdater-update-downloaded", GetHashCode(), _updateDownloaded, value);
348348
}
349349

src/ElectronNET.API/API/Clipboard.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public Task<ReadBookmark> ReadBookmarkAsync()
143143
{
144144
BridgeConnector.Socket.Off("clipboard-readBookmark-Completed");
145145

146-
taskCompletionSource.SetResult(JsonSerializer.Deserialize<ReadBookmark>(bookmark, ElectronJson.Options));
146+
taskCompletionSource.SetResult(bookmark.Deserialize<ReadBookmark>(ElectronJson.Options));
147147
});
148148

149149
BridgeConnector.Socket.Emit("clipboard-readBookmark");
@@ -220,7 +220,7 @@ public Task<string[]> AvailableFormatsAsync(string type = "")
220220
{
221221
BridgeConnector.Socket.Off("clipboard-availableFormats-Completed");
222222

223-
taskCompletionSource.SetResult(JsonSerializer.Deserialize<string[]>(formats, ElectronJson.Options));
223+
taskCompletionSource.SetResult(formats.Deserialize<string[]>(ElectronJson.Options));
224224
});
225225

226226
BridgeConnector.Socket.Emit("clipboard-availableFormats", type);

src/ElectronNET.API/API/Cookies.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using ElectronNET.API.Entities;
2+
using ElectronNET.API.Serialization;
23
using System;
4+
using System.Text.Json;
35

46
namespace ElectronNET.API
57
{
@@ -30,13 +32,13 @@ public event Action<Cookie, CookieChangedCause, bool> OnChanged
3032
{
3133
if (_changed == null)
3234
{
33-
BridgeConnector.Socket.On<System.Text.Json.JsonElement>("webContents-session-cookies-changed" + Id, (args) =>
35+
BridgeConnector.Socket.On<JsonElement>("webContents-session-cookies-changed" + Id, (args) =>
3436
{
3537
var e = args.EnumerateArray().GetEnumerator();
3638
e.MoveNext();
37-
var cookie = System.Text.Json.JsonSerializer.Deserialize<Cookie>(e.Current, Serialization.ElectronJson.Options);
39+
var cookie = e.Current.Deserialize<Cookie>(ElectronJson.Options);
3840
e.MoveNext();
39-
var cause = System.Text.Json.JsonSerializer.Deserialize<CookieChangedCause>(e.Current, Serialization.ElectronJson.Options);
41+
var cause = e.Current.Deserialize<CookieChangedCause>(ElectronJson.Options);
4042
e.MoveNext();
4143
var removed = e.Current.GetBoolean();
4244
_changed(cookie, cause, removed);

src/ElectronNET.API/API/Dialog.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using ElectronNET.API.Entities;
2+
using ElectronNET.API.Serialization;
23
using System;
34
using System.Text.Json;
45
using System.Threading.Tasks;
@@ -52,7 +53,7 @@ public Task<string[]> ShowOpenDialogAsync(BrowserWindow browserWindow, OpenDialo
5253
BridgeConnector.Socket.On<JsonElement>("showOpenDialogComplete" + guid, (filePaths) =>
5354
{
5455
BridgeConnector.Socket.Off("showOpenDialogComplete" + guid);
55-
var result = JsonSerializer.Deserialize<string[]>(filePaths, Serialization.ElectronJson.Options);
56+
var result = filePaths.Deserialize<string[]>(ElectronJson.Options);
5657
taskCompletionSource.SetResult(result);
5758
});
5859

src/ElectronNET.API/API/Dock.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using ElectronNET.API.Entities;
22
using ElectronNET.API.Extensions;
3+
using ElectronNET.API.Serialization;
34
using System.Collections.Generic;
45
using System.Text.Json;
56
using System.Threading;
@@ -209,7 +210,7 @@ public async Task<Menu> GetMenu(CancellationToken cancellationToken = default)
209210
BridgeConnector.Socket.On<JsonElement>("dock-getMenu-completed", (menu) =>
210211
{
211212
BridgeConnector.Socket.Off("dock-getMenu-completed");
212-
taskCompletionSource.SetResult(JsonSerializer.Deserialize<Menu>(menu, Serialization.ElectronJson.Options));
213+
taskCompletionSource.SetResult(menu.Deserialize<Menu>(ElectronJson.Options));
213214
});
214215

215216
BridgeConnector.Socket.Emit("dock-getMenu");

src/ElectronNET.API/API/Entities/BrowserWindowOptions.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ public class BrowserWindowOptions
213213
/// The style of window title bar. Default is default. Possible values are:
214214
/// 'default' | 'hidden' | 'hiddenInset' | 'customButtonsOnHover'
215215
/// </summary>
216-
[JsonConverter(typeof(JsonStringEnumConverter))]
217216
public TitleBarStyle TitleBarStyle { get; set; }
218217

219218
/// <summary>
@@ -256,7 +255,6 @@ public class BrowserWindowOptions
256255
/// appearance-based, light, dark, titlebar, selection, menu, popover, sidebar,
257256
/// medium-light or ultra-dark.
258257
/// </summary>
259-
[JsonConverter(typeof(JsonStringEnumConverter))]
260258
public Vibrancy Vibrancy { get; set; }
261259

262260
/// <summary>

src/ElectronNET.API/API/Entities/CookieChangedCause.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ namespace ElectronNET.API.Entities
66
/// <summary>
77
/// The cause of the change
88
/// </summary>
9-
[JsonConverter(typeof(JsonStringEnumConverter))]
109
public enum CookieChangedCause
1110
{
1211
/// <summary>

src/ElectronNET.API/API/Entities/InputEvent.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public class InputEvent
7575
/// `touchScrollStarted`, `pointerDown`, `pointerUp`, `pointerMove`,
7676
/// `pointerRawUpdate`, `pointerCancel` or `pointerCausedUaAction`.
7777
/// </summary>
78-
[JsonConverter(typeof(JsonStringEnumConverter))]
7978
public InputEventType Type { get; set; }
8079
}
8180
}

0 commit comments

Comments
 (0)