starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-09-21 14:35:16 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

removing '-event' suffix from event names to normalise naming convention

Browse Source
This commit is contained in:
agracio
2025-11-05 18:59:21 +00:00
parent ea688026d0
commit 87668f5606
11 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ElectronNET.API/API/App.cs
View File

@@ -41,7 +41,7 @@ namespace ElectronNET.API
}
});
BridgeConnector.Socket.Emit("register-app-window-all-closed-event", GetHashCode());
BridgeConnector.Socket.Emit("register-app-window-all-closed", GetHashCode());
}
_windowAllClosed += value;
}
@@ -113,7 +113,7 @@ namespace ElectronNET.API
}
});
BridgeConnector.Socket.Emit("register-app-before-quit-event", GetHashCode());
BridgeConnector.Socket.Emit("register-app-before-quit", GetHashCode());
}
_beforeQuit += value;
}
@@ -164,7 +164,7 @@ namespace ElectronNET.API
}
});
BridgeConnector.Socket.Emit("register-app-will-quit-event", GetHashCode());
BridgeConnector.Socket.Emit("register-app-will-quit", GetHashCode());
}
_willQuit += value;
}
@@ -199,7 +199,7 @@ namespace ElectronNET.API
}
});
BridgeConnector.Socket.Emit("register-app-will-quit-event", GetHashCode() + "quitting");
BridgeConnector.Socket.Emit("register-app-will-quit", GetHashCode() + "quitting");
}
_quitting += value;
}
@@ -219,7 +219,7 @@ namespace ElectronNET.API
/// </summary>
public event Action BrowserWindowBlur
{
add => ApiEventManager.AddEventWithSuffix("app-browser-window-blur", GetHashCode(), _browserWindowBlur, value);
add => ApiEventManager.AddEvent("app-browser-window-blur", GetHashCode(), _browserWindowBlur, value);
remove => ApiEventManager.RemoveEvent("app-browser-window-blur", GetHashCode(), _browserWindowBlur, value);
}
@@ -230,7 +230,7 @@ namespace ElectronNET.API
/// </summary>
public event Action BrowserWindowFocus
{
add => ApiEventManager.AddEventWithSuffix("app-browser-window-focus", GetHashCode(), _browserWindowFocus, value);
add => ApiEventManager.AddEvent("app-browser-window-focus", GetHashCode(), _browserWindowFocus, value);
remove => ApiEventManager.RemoveEvent("app-browser-window-focus", GetHashCode(), _browserWindowFocus, value);
}
@@ -241,7 +241,7 @@ namespace ElectronNET.API
/// </summary>
public event Action BrowserWindowCreated
{
add => ApiEventManager.AddEventWithSuffix("app-browser-window-created", GetHashCode(), _browserWindowCreated, value);
add => ApiEventManager.AddEvent("app-browser-window-created", GetHashCode(), _browserWindowCreated, value);
remove => ApiEventManager.RemoveEvent("app-browser-window-created", GetHashCode(), _browserWindowCreated, value);
}
@@ -252,7 +252,7 @@ namespace ElectronNET.API
/// </summary>
public event Action WebContentsCreated
{
add => ApiEventManager.AddEventWithSuffix("app-web-contents-created", GetHashCode(), _webContentsCreated, value);
add => ApiEventManager.AddEvent("app-web-contents-created", GetHashCode(), _webContentsCreated, value);
remove => ApiEventManager.RemoveEvent("app-web-contents-created", GetHashCode(), _webContentsCreated, value);
}
@@ -265,7 +265,7 @@ namespace ElectronNET.API
/// <returns><see langword="true"/> when Chrome's accessibility support is enabled, <see langword="false"/> otherwise.</returns>
public event Action<bool> AccessibilitySupportChanged
{
add => ApiEventManager.AddEventWithSuffix("app-accessibility-support-changed", GetHashCode(), _accessibilitySupportChanged, value, (args) => (bool)args);
add => ApiEventManager.AddEvent("app-accessibility-support-changed", GetHashCode(), _accessibilitySupportChanged, value, (args) => (bool)args);
remove => ApiEventManager.RemoveEvent("app-accessibility-support-changed", GetHashCode(), _accessibilitySupportChanged, value);
}
@@ -320,7 +320,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<string> OpenFile
{
add => ApiEventManager.AddEventWithSuffix("app-open-file", GetHashCode(), _openFile, value, (args) => args.ToString());
add => ApiEventManager.AddEvent("app-open-file", GetHashCode(), _openFile, value, (args) => args.ToString());
remove => ApiEventManager.RemoveEvent("app-open-file", GetHashCode(), _openFile, value);
}
@@ -333,7 +333,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<string> OpenUrl
{
add => ApiEventManager.AddEventWithSuffix("app-open-url", GetHashCode(), _openUrl, value, (args) => args.ToString());
add => ApiEventManager.AddEvent("app-open-url", GetHashCode(), _openUrl, value, (args) => args.ToString());
remove => ApiEventManager.RemoveEvent("app-open-url", GetHashCode(), _openUrl, value);
}

12
src/ElectronNET.API/API/AutoUpdater.cs
View File

@@ -288,7 +288,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<string> OnError
{
add => ApiEventManager.AddEventWithSuffix("autoUpdater-error", GetHashCode(), _error, value, (args) => args.ToString());
add => ApiEventManager.AddEvent("autoUpdater-error", GetHashCode(), _error, value, (args) => args.ToString());
remove => ApiEventManager.RemoveEvent("autoUpdater-error", GetHashCode(), _error, value);
}
@@ -299,7 +299,7 @@ namespace ElectronNET.API
/// </summary>
public event Action OnCheckingForUpdate
{
add => ApiEventManager.AddEventWithSuffix("autoUpdater-checking-for-update", GetHashCode(), _checkingForUpdate, value);
add => ApiEventManager.AddEvent("autoUpdater-checking-for-update", GetHashCode(), _checkingForUpdate, value);
remove => ApiEventManager.RemoveEvent("autoUpdater-checking-for-update", GetHashCode(), _checkingForUpdate, value);
}
@@ -311,7 +311,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<UpdateInfo> OnUpdateAvailable
{
add => ApiEventManager.AddEventWithSuffix("autoUpdater-update-available", GetHashCode(), _updateAvailable, value, (args) => JObject.Parse(args.ToString()).ToObject<UpdateInfo>());
add => ApiEventManager.AddEvent("autoUpdater-update-available", GetHashCode(), _updateAvailable, value, (args) => JObject.Parse(args.ToString()).ToObject<UpdateInfo>());
remove => ApiEventManager.RemoveEvent("autoUpdater-update-available", GetHashCode(), _updateAvailable, value);
}
@@ -322,7 +322,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<UpdateInfo> OnUpdateNotAvailable
{
add => ApiEventManager.AddEventWithSuffix("autoUpdater-update-not-available", GetHashCode(), _updateNotAvailable, value, (args) => JObject.Parse(args.ToString()).ToObject<UpdateInfo>());
add => ApiEventManager.AddEvent("autoUpdater-update-not-available", GetHashCode(), _updateNotAvailable, value, (args) => JObject.Parse(args.ToString()).ToObject<UpdateInfo>());
remove => ApiEventManager.RemoveEvent("autoUpdater-update-not-available", GetHashCode(), _updateNotAvailable, value);
}
@@ -333,7 +333,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<ProgressInfo> OnDownloadProgress
{
add => ApiEventManager.AddEventWithSuffix("autoUpdater-download-progress", GetHashCode(), _downloadProgress, value, (args) => JObject.Parse(args.ToString()).ToObject<ProgressInfo>());
add => ApiEventManager.AddEvent("autoUpdater-download-progress", GetHashCode(), _downloadProgress, value, (args) => JObject.Parse(args.ToString()).ToObject<ProgressInfo>());
remove => ApiEventManager.RemoveEvent("autoUpdater-download-progress", GetHashCode(), _downloadProgress, value);
}
@@ -344,7 +344,7 @@ namespace ElectronNET.API
/// </summary>
public event Action<UpdateInfo> OnUpdateDownloaded
{
add => ApiEventManager.AddEventWithSuffix("autoUpdater-update-downloaded", GetHashCode(), _updateDownloaded, value, (args) => JObject.Parse(args.ToString()).ToObject<UpdateInfo>());
add => ApiEventManager.AddEvent("autoUpdater-update-downloaded", GetHashCode(), _updateDownloaded, value, (args) => JObject.Parse(args.ToString()).ToObject<UpdateInfo>());
remove => ApiEventManager.RemoveEvent("autoUpdater-update-downloaded", GetHashCode(), _updateDownloaded, value);
}

2
src/ElectronNET.API/API/WindowManager.cs
View File

@@ -51,7 +51,7 @@ namespace ElectronNET.API
get => _isQuitOnWindowAllClosed;
set
{
BridgeConnector.Socket.Emit("quit-app-window-all-closed-event", value);
BridgeConnector.Socket.Emit("quit-app-window-all-closed", value);
_isQuitOnWindowAllClosed = value;
}
}

12
src/ElectronNET.API/Common/ApiEventManager.cs
View File

@@ -5,7 +5,7 @@ using Newtonsoft.Json.Linq;
namespace ElectronNET.Common;
internal class ApiEventManager
internal static class ApiEventManager
{
internal static void AddEvent(string eventName, object id, Action callback, Action value, string suffix = "")
{
@@ -17,11 +17,6 @@ internal class ApiEventManager
callback += value;
}
internal static void AddEventWithSuffix(string eventName, object id, Action callback, Action value)
{
AddEvent(eventName, id, callback, value, "-event");
}
internal static void RemoveEvent(string eventName, object id, Action callback, Action value)
{
callback -= value;
@@ -52,11 +47,6 @@ internal class ApiEventManager
callback += value;
}
internal static void AddEventWithSuffix<T>(string eventName, object id, Action<T> callback, Action<T> value, Func<object, T> converter)
{
AddEvent(eventName, id, callback, value, converter, "-event");
}
internal static void RemoveEvent<T>(string eventName, object id, Action<T> callback, Action<T> value)
{
callback -= value;

18
src/ElectronNET.Host/api/app.js
View File

@@ -18,45 +18,45 @@ module.exports = (socket, app) => {
electronSocket.emit('app-window-all-closed' + appWindowAllClosedEventId);
}
});
socket.on('quit-app-window-all-closed-event', (quit) => {
socket.on('quit-app-window-all-closed', (quit) => {
isQuitWindowAllClosed = quit;
});
socket.on('register-app-window-all-closed-event', (id) => {
socket.on('register-app-window-all-closed', (id) => {
appWindowAllClosedEventId = id;
});
socket.on('register-app-before-quit-event', (id) => {
socket.on('register-app-before-quit', (id) => {
app.on('before-quit', (event) => {
event.preventDefault();
electronSocket.emit('app-before-quit' + id);
});
});
socket.on('register-app-will-quit-event', (id) => {
socket.on('register-app-will-quit', (id) => {
app.on('will-quit', (event) => {
event.preventDefault();
electronSocket.emit('app-will-quit' + id);
});
});
socket.on('register-app-browser-window-blur-event', (id) => {
socket.on('register-app-browser-window-blur', (id) => {
app.on('browser-window-blur', () => {
electronSocket.emit('app-browser-window-blur' + id);
});
});
socket.on('register-app-browser-window-focus-event', (id) => {
socket.on('register-app-browser-window-focus', (id) => {
app.on('browser-window-focus', () => {
electronSocket.emit('app-browser-window-focus' + id);
});
});
socket.on('register-app-browser-window-created-event', (id) => {
socket.on('register-app-browser-window-created', (id) => {
app.on('browser-window-created', () => {
electronSocket.emit('app-browser-window-created' + id);
});
});
socket.on('register-app-web-contents-created-event', (id) => {
socket.on('register-app-web-contents-created', (id) => {
app.on('web-contents-created', () => {
electronSocket.emit('app-web-contents-created' + id);
});
});
socket.on('register-app-accessibility-support-changed-event', (id) => {
socket.on('register-app-accessibility-support-changed', (id) => {
app.on('accessibility-support-changed', (event, accessibilitySupportEnabled) => {
electronSocket.emit('app-accessibility-support-changed' + id, accessibilitySupportEnabled);
});

18
src/ElectronNET.Host/api/app.ts
View File

@@ -21,15 +21,15 @@ export = (socket: Socket, app: Electron.App) => {
}
});
socket.on('quit-app-window-all-closed-event', (quit) => {
socket.on('quit-app-window-all-closed', (quit) => {
isQuitWindowAllClosed = quit;
});
socket.on('register-app-window-all-closed-event', (id) => {
socket.on('register-app-window-all-closed', (id) => {
appWindowAllClosedEventId = id;
});
socket.on('register-app-before-quit-event', (id) => {
socket.on('register-app-before-quit', (id) => {
app.on('before-quit', (event) => {
event.preventDefault();
@@ -37,7 +37,7 @@ export = (socket: Socket, app: Electron.App) => {
});
});
socket.on('register-app-will-quit-event', (id) => {
socket.on('register-app-will-quit', (id) => {
app.on('will-quit', (event) => {
event.preventDefault();
@@ -45,31 +45,31 @@ export = (socket: Socket, app: Electron.App) => {
});
});
socket.on('register-app-browser-window-blur-event', (id) => {
socket.on('register-app-browser-window-blur', (id) => {
app.on('browser-window-blur', () => {
electronSocket.emit('app-browser-window-blur' + id);
});
});
socket.on('register-app-browser-window-focus-event', (id) => {
socket.on('register-app-browser-window-focus', (id) => {
app.on('browser-window-focus', () => {
electronSocket.emit('app-browser-window-focus' + id);
});
});
socket.on('register-app-browser-window-created-event', (id) => {
socket.on('register-app-browser-window-created', (id) => {
app.on('browser-window-created', () => {
electronSocket.emit('app-browser-window-created' + id);
});
});
socket.on('register-app-web-contents-created-event', (id) => {
socket.on('register-app-web-contents-created', (id) => {
app.on('web-contents-created', () => {
electronSocket.emit('app-web-contents-created' + id);
});
});
socket.on('register-app-accessibility-support-changed-event', (id) => {
socket.on('register-app-accessibility-support-changed', (id) => {
app.on('accessibility-support-changed', (event, accessibilitySupportEnabled) => {
electronSocket.emit('app-accessibility-support-changed' + id, accessibilitySupportEnabled);
});

12
src/ElectronNET.Host/api/autoUpdater.js
View File

@@ -3,32 +3,32 @@ const electron_updater_1 = require("electron-updater");
let electronSocket;
module.exports = (socket) => {
electronSocket = socket;
socket.on('register-autoUpdater-error-event', (id) => {
socket.on('register-autoUpdater-error', (id) => {
electron_updater_1.autoUpdater.on('error', (error) => {
electronSocket.emit('autoUpdater-error' + id, error.message);
});
});
socket.on('register-autoUpdater-checking-for-update-event', (id) => {
socket.on('register-autoUpdater-checking-for-update', (id) => {
electron_updater_1.autoUpdater.on('checking-for-update', () => {
electronSocket.emit('autoUpdater-checking-for-update' + id);
});
});
socket.on('register-autoUpdater-update-available-event', (id) => {
socket.on('register-autoUpdater-update-available', (id) => {
electron_updater_1.autoUpdater.on('update-available', (updateInfo) => {
electronSocket.emit('autoUpdater-update-available' + id, updateInfo);
});
});
socket.on('register-autoUpdater-update-not-available-event', (id) => {
socket.on('register-autoUpdater-update-not-available', (id) => {
electron_updater_1.autoUpdater.on('update-not-available', (updateInfo) => {
electronSocket.emit('autoUpdater-update-not-available' + id, updateInfo);
});
});
socket.on('register-autoUpdater-download-progress-event', (id) => {
socket.on('register-autoUpdater-download-progress', (id) => {
electron_updater_1.autoUpdater.on('download-progress', (progressInfo) => {
electronSocket.emit('autoUpdater-download-progress' + id, progressInfo);
});
});
socket.on('register-autoUpdater-update-downloaded-event', (id) => {
socket.on('register-autoUpdater-update-downloaded', (id) => {
electron_updater_1.autoUpdater.on('update-downloaded', (updateInfo) => {
electronSocket.emit('autoUpdater-update-downloaded' + id, updateInfo);
});

12
src/ElectronNET.Host/api/autoUpdater.ts
View File

@@ -5,37 +5,37 @@ let electronSocket;
export = (socket: Socket) => {
electronSocket = socket;
socket.on('register-autoUpdater-error-event', (id) => {
socket.on('register-autoUpdater-error', (id) => {
autoUpdater.on('error', (error) => {
electronSocket.emit('autoUpdater-error' + id, error.message);
});
});
socket.on('register-autoUpdater-checking-for-update-event', (id) => {
socket.on('register-autoUpdater-checking-for-update', (id) => {
autoUpdater.on('checking-for-update', () => {
electronSocket.emit('autoUpdater-checking-for-update' + id);
});
});
socket.on('register-autoUpdater-update-available-event', (id) => {
socket.on('register-autoUpdater-update-available', (id) => {
autoUpdater.on('update-available', (updateInfo) => {
electronSocket.emit('autoUpdater-update-available' + id, updateInfo);
});
});
socket.on('register-autoUpdater-update-not-available-event', (id) => {
socket.on('register-autoUpdater-update-not-available', (id) => {
autoUpdater.on('update-not-available', (updateInfo) => {
electronSocket.emit('autoUpdater-update-not-available' + id, updateInfo);
});
});
socket.on('register-autoUpdater-download-progress-event', (id) => {
socket.on('register-autoUpdater-download-progress', (id) => {
autoUpdater.on('download-progress', (progressInfo) => {
electronSocket.emit('autoUpdater-download-progress' + id, progressInfo);
});
});
socket.on('register-autoUpdater-update-downloaded-event', (id) => {
socket.on('register-autoUpdater-update-downloaded', (id) => {
autoUpdater.on('update-downloaded', (updateInfo) => {
electronSocket.emit('autoUpdater-update-downloaded' + id, updateInfo);
});

2
src/ElectronNET.Host/api/nativeTheme.js
View File

@@ -22,7 +22,7 @@ module.exports = (socket) => {
socket.on('nativeTheme-themeSource', (themeSource) => {
electron_1.nativeTheme.themeSource = themeSource;
});
socket.on('register-nativeTheme-updated-event', (id) => {
socket.on('register-nativeTheme-updated', (id) => {
electron_1.nativeTheme.on('updated', () => {
electronSocket.emit('nativeTheme-updated' + id);
});

2
src/ElectronNET.Host/api/nativeTheme.ts
View File

@@ -33,7 +33,7 @@ export = (socket: Socket) => {
nativeTheme.themeSource = themeSource;
});
socket.on('register-nativeTheme-updated-event', (id) => {
socket.on('register-nativeTheme-updated', (id) => {
nativeTheme.on('updated', () => {
electronSocket.emit('nativeTheme-updated' + id);
});

4
src/ElectronNET.Host/main.js
View File

@@ -328,7 +328,7 @@ function startSocketApiBridge(port) {
if (nativeTheme === undefined) nativeTheme = require('./api/nativeTheme')(socket);
if (dock === undefined) dock = require('./api/dock')(socket);
socket.on('register-app-open-file-event', (id) => {
socket.on('register-app-open-file', (id) => {
global['electronsocket'] = socket;
app.on('open-file', (event, file) => {
@@ -342,7 +342,7 @@ function startSocketApiBridge(port) {
}
});
socket.on('register-app-open-url-event', (id) => {
socket.on('register-app-open-url', (id) => {
global['electronsocket'] = socket;
app.on('open-url', (event, url) => {