sudacode/SubMiner
1
0
Fork 0
mirror of https://github.com/ksyasuda/SubMiner.git synced 2026-02-28 06:22:45 -08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract global shortcut registration service

Browse Source
This commit is contained in:
Kyle Yasuda
2026-02-09 19:40:40 -08:00
parent f61524bef4
commit 3fb18c6b03
2 changed files with 89 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/core/services/shortcut-service.ts Normal file
View File

@@ -0,0 +1,81 @@
import { BrowserWindow, globalShortcut } from "electron";
export interface GlobalShortcutConfig {
toggleVisibleOverlayGlobal: string | null | undefined;
toggleInvisibleOverlayGlobal: string | null | undefined;
}
export function registerGlobalShortcutsService(options: {
shortcuts: GlobalShortcutConfig;
onToggleVisibleOverlay: () => void;
onToggleInvisibleOverlay: () => void;
onOpenYomitanSettings: () => void;
isDev: boolean;
getMainWindow: () => BrowserWindow | null;
}): void {
const visibleShortcut = options.shortcuts.toggleVisibleOverlayGlobal;
const invisibleShortcut = options.shortcuts.toggleInvisibleOverlayGlobal;
const normalizedVisible = visibleShortcut?.replace(/\s+/g, "").toLowerCase();
const normalizedInvisible = invisibleShortcut
?.replace(/\s+/g, "")
.toLowerCase();
if (visibleShortcut) {
const toggleVisibleRegistered = globalShortcut.register(
visibleShortcut,
() => {
options.onToggleVisibleOverlay();
},
);
if (!toggleVisibleRegistered) {
console.warn(
`Failed to register global shortcut toggleVisibleOverlayGlobal: ${visibleShortcut}`,
);
}
}
if (
invisibleShortcut &&
normalizedInvisible &&
normalizedInvisible !== normalizedVisible
) {
const toggleInvisibleRegistered = globalShortcut.register(
invisibleShortcut,
() => {
options.onToggleInvisibleOverlay();
},
);
if (!toggleInvisibleRegistered) {
console.warn(
`Failed to register global shortcut toggleInvisibleOverlayGlobal: ${invisibleShortcut}`,
);
}
} else if (
invisibleShortcut &&
normalizedInvisible &&
normalizedInvisible === normalizedVisible
) {
console.warn(
"Skipped registering toggleInvisibleOverlayGlobal because it collides with toggleVisibleOverlayGlobal",
);
}
const settingsRegistered = globalShortcut.register("Alt+Shift+Y", () => {
options.onOpenYomitanSettings();
});
if (!settingsRegistered) {
console.warn("Failed to register global shortcut: Alt+Shift+Y");
}
if (options.isDev) {
const devtoolsRegistered = globalShortcut.register("F12", () => {
const mainWindow = options.getMainWindow();
if (mainWindow && !mainWindow.isDestroyed()) {
mainWindow.webContents.toggleDevTools();
}
});
if (!devtoolsRegistered) {
console.warn("Failed to register global shortcut: F12");
}
}
}

72
src/main.ts
View File

@@ -129,6 +129,7 @@ import {
hasMpvWebsocketPlugin,
SubtitleWebSocketService,
} from "./core/services/subtitle-ws-service";
import { registerGlobalShortcutsService } from "./core/services/shortcut-service";
import {
ConfigService,
DEFAULT_CONFIG,
@@ -2330,71 +2331,14 @@ function openYomitanSettings(): void {
}
function registerGlobalShortcuts(): void {
const shortcuts = getConfiguredShortcuts();
const visibleShortcut = shortcuts.toggleVisibleOverlayGlobal;
const invisibleShortcut = shortcuts.toggleInvisibleOverlayGlobal;
const normalizedVisible = visibleShortcut?.replace(/\s+/g, "").toLowerCase();
const normalizedInvisible = invisibleShortcut
?.replace(/\s+/g, "")
.toLowerCase();
if (visibleShortcut) {
const toggleVisibleRegistered = globalShortcut.register(
visibleShortcut,
() => {
toggleVisibleOverlay();
},
);
if (!toggleVisibleRegistered) {
console.warn(
`Failed to register global shortcut toggleVisibleOverlayGlobal: ${visibleShortcut}`,
);
}
}
if (
invisibleShortcut &&
normalizedInvisible &&
normalizedInvisible !== normalizedVisible
) {
const toggleInvisibleRegistered = globalShortcut.register(
invisibleShortcut,
() => {
toggleInvisibleOverlay();
},
);
if (!toggleInvisibleRegistered) {
console.warn(
`Failed to register global shortcut toggleInvisibleOverlayGlobal: ${invisibleShortcut}`,
);
}
} else if (
invisibleShortcut &&
normalizedInvisible &&
normalizedInvisible === normalizedVisible
) {
console.warn(
"Skipped registering toggleInvisibleOverlayGlobal because it collides with toggleVisibleOverlayGlobal",
);
}
const settingsRegistered = globalShortcut.register("Alt+Shift+Y", () => {
openYomitanSettings();
registerGlobalShortcutsService({
shortcuts: getConfiguredShortcuts(),
onToggleVisibleOverlay: () => toggleVisibleOverlay(),
onToggleInvisibleOverlay: () => toggleInvisibleOverlay(),
onOpenYomitanSettings: () => openYomitanSettings(),
isDev,
getMainWindow: () => mainWindow,
});
if (!settingsRegistered) {
console.warn("Failed to register global shortcut: Alt+Shift+Y");
}
if (isDev) {
const devtoolsRegistered = globalShortcut.register("F12", () => {
if (mainWindow && !mainWindow.isDestroyed()) {
mainWindow.webContents.toggleDevTools();
}
});
if (!devtoolsRegistered) {
console.warn("Failed to register global shortcut: F12");
}
}
}
function getConfiguredShortcuts() {