refactor: ホットキー設定のデフォルト値やConfigManagerをisMac指定可能に (VOICEVOX#2426)

src/backend/browser/browserConfig.ts

@@ -5,6 +5,7 @@ import { BaseConfigManager, Metadata } from "@/backend/common/ConfigManager";
 import { ConfigType, EngineId, engineSettingSchema } from "@/type/preload";
 import { ensureNotNullish } from "@/helpers/errorHelper";
 import { UnreachableError } from "@/type/utility";
+import { isMac } from "@/helpers/platform";
 
 const dbName = `${import.meta.env.VITE_APP_NAME}-web`;
 const settingStoreKey = "config";
@@ -20,7 +21,7 @@ const defaultEngineId = EngineId(defaultEngine.uuid);
 export async function getConfigManager() {
   await configManagerLock.acquire("configManager", async () => {
     if (!configManager) {
-      configManager = new BrowserConfigManager();
+      configManager = new BrowserConfigManager(isMac);
       await configManager.initialize();
     }
   });

src/backend/common/ConfigManager.ts

@@ -3,7 +3,7 @@ import AsyncLock from "async-lock";
 import {
   AcceptTermsStatus,
   ConfigType,
-  configSchema,
+  getConfigSchema,
   DefaultStyleId,
   ExperimentalSettingType,
   VoiceId,
@@ -13,9 +13,10 @@ import { ensureNotNullish } from "@/helpers/errorHelper";
 import { loadEnvEngineInfos } from "@/domain/defaultEngine/envEngineInfo";
 import {
   HotkeyCombination,
-  defaultHotkeySettings,
+  getDefaultHotkeySettings,
   HotkeySettingType,
 } from "@/domain/hotkeyAction";
+import { isMac } from "@/helpers/platform";
 
 const lockKey = "save";
 
@@ -308,6 +309,8 @@ export abstract class BaseConfigManager {
 
   protected abstract getAppVersion(): string;
 
+  constructor(protected isMac: boolean) {}
+
   public reset() {
     this.config = this.getDefaultConfig();
     this._save();
@@ -322,7 +325,9 @@ export abstract class BaseConfigManager {
           migration(data);
         }
       }
-      this.config = this.migrateHotkeySettings(configSchema.parse(data));
+      this.config = this.migrateHotkeySettings(
+        getConfigSchema(this.isMac).parse(data),
+      );
       this._save();
     } else {
       this.reset();
@@ -352,7 +357,7 @@ export abstract class BaseConfigManager {
   private _save() {
     void this.lock.acquire(lockKey, async () => {
       await this.save({
-        ...configSchema.parse({
+        ...getConfigSchema(this.isMac).parse({
           ...this.config,
         }),
         __internal__: {
@@ -387,7 +392,7 @@ export abstract class BaseConfigManager {
   private migrateHotkeySettings(data: ConfigType): ConfigType {
     const COMBINATION_IS_NONE = HotkeyCombination("####");
     const loadedHotkeys = structuredClone(data.hotkeySettings);
-    const hotkeysWithoutNewCombination = defaultHotkeySettings.map(
+    const hotkeysWithoutNewCombination = getDefaultHotkeySettings(isMac).map(
       (defaultHotkey) => {
         const loadedHotkey = loadedHotkeys.find(
           (loadedHotkey) => loadedHotkey.action === defaultHotkey.action,
@@ -402,7 +407,7 @@ export abstract class BaseConfigManager {
     const migratedHotkeys = hotkeysWithoutNewCombination.map((hotkey) => {
       if (hotkey.combination === COMBINATION_IS_NONE) {
         const newHotkey = ensureNotNullish(
-          defaultHotkeySettings.find(
+          getDefaultHotkeySettings(isMac).find(
             (defaultHotkey) => defaultHotkey.action === hotkey.action,
           ),
         );
@@ -429,6 +434,6 @@ export abstract class BaseConfigManager {
   }
 
   protected getDefaultConfig(): ConfigType {
-    return configSchema.parse({});
+    return getConfigSchema(this.isMac).parse({});
   }
 }

src/backend/electron/electronConfig.ts

@@ -4,6 +4,7 @@ import { app } from "electron";
 import { writeFileSafely } from "./fileHelper";
 import { BaseConfigManager, Metadata } from "@/backend/common/ConfigManager";
 import { ConfigType } from "@/type/preload";
+import { isMac } from "@/helpers/platform";
 
 export class ElectronConfigManager extends BaseConfigManager {
   protected getAppVersion() {
@@ -35,7 +36,7 @@ let configManager: ElectronConfigManager | undefined;
 
 export function getConfigManager(): ElectronConfigManager {
   if (!configManager) {
-    configManager = new ElectronConfigManager();
+    configManager = new ElectronConfigManager(isMac);
   }
   return configManager;
 }

src/components/Dialog/HotkeySettingDialog.vue

@@ -130,8 +130,9 @@ import { useHotkeyManager, eventToCombination } from "@/plugins/hotkeyPlugin";
 import {
   HotkeyCombination,
   HotkeyActionNameType,
-  defaultHotkeySettings,
+  getDefaultHotkeySettings,
 } from "@/domain/hotkeyAction";
+import { isMac } from "@/helpers/platform";
 
 const props = defineProps<{
   modelValue: boolean;
@@ -226,7 +227,7 @@ const setHotkeyDialogOpened = () => {
 };
 
 const isDefaultCombination = (action: string) => {
-  const defaultSetting = defaultHotkeySettings.find(
+  const defaultSetting = getDefaultHotkeySettings(isMac).find(
     (value) => value.action === action,
   );
   const hotkeySetting = hotkeySettings.value.find(
@@ -244,7 +245,9 @@ const resetHotkey = async (action: string) => {
 
   if (result !== "OK") return;
 
-  const setting = defaultHotkeySettings.find((value) => value.action == action);
+  const setting = getDefaultHotkeySettings(isMac).find(
+    (value) => value.action == action,
+  );
   if (setting == undefined) {
     return;
   }