起動時チェックをオプションにし、チェックでの自動ダウンロードはしないように

VOICEVOX · Dec 16, 2021 · d4cca24 · d4cca24
1 parent c4958bd
commit d4cca24
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 1 deletion.
diff --git a/src/background.ts b/src/background.ts
@@ -49,6 +49,7 @@ if (isDevelopment) {
 }
 
 autoUpdater.logger = log;
+autoUpdater.autoDownload = false;
 
 let win: BrowserWindow;
 
@@ -175,6 +176,7 @@ const store = new Store<{
         outputStereo: { type: "boolean", default: false },
         outputSamplingRate: { type: "number", default: 24000 },
         audioOutputDevice: { type: "string", default: "default" },
+        enableAutoUpdateCheck: { type: "boolean", default: false },
       },
       default: {
         fileEncoding: "UTF-8",
@@ -186,6 +188,7 @@ const store = new Store<{
         outputStereo: false,
         outputSamplingRate: 24000,
         audioOutputDevice: "default",
+        enableAutoUpdateCheck: false,
       },
     },
     // To future developers: if you are to modify the store schema with array type,
@@ -568,6 +571,18 @@ ipcMainHandle("INHERIT_AUDIOINFO", (_, { newValue }) => {
   return store.get("inheritAudioInfo", false);
 });
 
+ipcMainHandle("ENABLE_AUTO_UPDATE_CHECK", (_, { newValue }) => {
+  if (newValue !== undefined) {
+    store.set("enableAutoUpdateCheck", newValue);
+  }
+
+  return store.get("enableAutoUpdateCheck", false);
+});
+
+ipcMainHandle("UPDATE_CHECK", () => {
+  autoUpdater.checkForUpdatesAndNotify();
+});
+
 ipcMainHandle("IS_AVAILABLE_GPU_MODE", () => {
   return hasSupportedGpu();
 });
@@ -800,7 +815,10 @@ app.on("ready", async () => {
   }
 
   createWindow().then(() => runEngine());
-  autoUpdater.checkForUpdatesAndNotify();
+  const enableAutoUpdateCheck = store.get("enableAutoUpdateCheck", false);
+  if (enableAutoUpdateCheck) {
+    autoUpdater.checkForUpdatesAndNotify();
+  }
 });
 
 app.on("second-instance", () => {
@@ -834,6 +852,19 @@ autoUpdater.on("checking-for-update", () => {
 // アップデートが見つかった
 autoUpdater.on("update-available", () => {
   log.info(process.pid, "Update available.");
+  const dialogOpts = {
+    type: "info",
+    buttons: ["はい", "いいえ"],
+    message: "アップデート",
+    detail:
+      "新しいバージョンをがありました。更新をダウンロードしますか？",
+  }
+  // ダイアログを表示しすぐに再起動するか確認
+  dialog.showMessageBox(win, dialogOpts).then((returnValue) => {
+    if (returnValue.response === 0) {
+      autoUpdater.downloadUpdate();
+    }
+  });
 });
 // アップデートがなかった（最新版だった）
 autoUpdater.on("update-not-available", () => {

diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue
@@ -329,6 +329,16 @@ export default defineComponent({
               });
             },
           },
+          { type: "separator" },
+          {
+            type: "button",
+            label: "アップデート確認",
+            onClick() {
+              store.dispatch("IS_UPDATE_CHECK_DIALOG_OPEN", {
+                isUpdateCheckDialogOpen: true,
+              });
+            },
+          },
         ],
       },
       {

diff --git a/src/components/SettingDialog.vue b/src/components/SettingDialog.vue
@@ -305,6 +305,28 @@
                   </q-tooltip>
                 </q-select>
               </q-card-actions>
+              <q-card-actions class="q-px-md q-py-none bg-grey-3">
+                <div>自動アップデートチェック</div>
+                <q-space />
+                <q-toggle
+                  name="enabled"
+                  align="left"
+                  :model-value="savingSetting.enableAutoUpdateCheck"
+                  @update:model-value="
+                    handleSavingSettingChange('enableAutoUpdateCheck', $event)
+                  "
+                >
+                  <q-tooltip
+                    :delay="500"
+                    anchor="center left"
+                    self="center right"
+                    transition-show="jump-left"
+                    transition-hide="jump-right"
+                  >
+                    起動時にアップデートチェックを行います
+                  </q-tooltip>
+                </q-toggle>
+              </q-card-actions>
             </q-card>
             <!-- 今後実験的機能を追加する場合はここに追加 -->
             <!-- FIXME: 0.9.1に間に合わなかったのでダークモード機能を一旦省きました -->

diff --git a/src/electron/preload.ts b/src/electron/preload.ts
@@ -136,6 +136,14 @@ const api: Sandbox = {
     return ipcRendererInvoke("INHERIT_AUDIOINFO", { newValue });
   },
 
+  enableAutoUpdateCheck: (newValue) => {
+    return ipcRendererInvoke("ENABLE_AUTO_UPDATE_CHECK", { newValue });
+  },
+
+  updateCheck: () => {
+    return ipcRendererInvoke("UPDATE_CHECK");
+  },
+
   isAvailableGPUMode: () => {
     return ipcRendererInvoke("IS_AVAILABLE_GPU_MODE");
   },

diff --git a/src/store/type.ts b/src/store/type.ts
@@ -661,6 +661,7 @@ export type UiStoreState = {
   inheritAudioInfo: boolean;
   isHelpDialogOpen: boolean;
   isSettingDialogOpen: boolean;
+  isUpdateCheckDialogOpen: boolean;
   isDefaultStyleSelectDialogOpen: boolean;
   isHotkeySettingDialogOpen: boolean;
   isMaximized: boolean;
@@ -714,6 +715,11 @@ type UiStoreTypes = {
     action(payload: { isSettingDialogOpen: boolean }): void;
   };
 
+  IS_UPDATE_CHECK_DIALOG_OPEN: {
+    mutation: { isUpdateCheckDialogOpen: boolean };
+    action(payload: { isUpdateCheckDialogOpen: boolean }): void;
+  };
+
   IS_HOTKEY_SETTING_DIALOG_OPEN: {
     mutation: { isHotkeySettingDialogOpen: boolean };
     action(payload: { isHotkeySettingDialogOpen: boolean }): void;

diff --git a/src/store/ui.ts b/src/store/ui.ts
@@ -33,6 +33,7 @@ export const uiStoreState: UiStoreState = {
   inheritAudioInfo: true,
   isHelpDialogOpen: false,
   isSettingDialogOpen: false,
+  isUpdateCheckDialogOpen: false,
   isHotkeySettingDialogOpen: false,
   isDefaultStyleSelectDialogOpen: false,
   isMaximized: false,
@@ -78,6 +79,12 @@ export const uiStore: VoiceVoxStoreOptions<UiGetters, UiActions, UiMutations> =
       ) {
         state.isSettingDialogOpen = isSettingDialogOpen;
       },
+      IS_UPDATE_CHECK_DIALOG_OPEN(
+        state,
+        { isUpdateCheckDialogOpen }: { isUpdateCheckDialogOpen: boolean }
+      ) {
+        state.isUpdateCheckDialogOpen = isUpdateCheckDialogOpen;
+      },
       IS_HOTKEY_SETTING_DIALOG_OPEN(state, { isHotkeySettingDialogOpen }) {
         state.isHotkeySettingDialogOpen = isHotkeySettingDialogOpen;
       },
@@ -162,6 +169,20 @@ export const uiStore: VoiceVoxStoreOptions<UiGetters, UiActions, UiMutations> =
 
         commit("IS_SETTING_DIALOG_OPEN", { isSettingDialogOpen });
       },
+      async IS_UPDATE_CHECK_DIALOG_OPEN(
+        { state, commit },
+        { isUpdateCheckDialogOpen }: { isUpdateCheckDialogOpen: boolean }
+      ) {
+        const result: number = await window.electron.showInfoDialog({
+          title: "自動アップデートチェック",
+          message: "自動アップデートチェックを行います。\nよろしいですか？",
+          buttons: ["はい", "いいえ"],
+        });
+        if (result == 1) {
+          return;
+        }
+        window.electron.updateCheck();
+      },
       IS_HOTKEY_SETTING_DIALOG_OPEN(
         { state, commit },
         { isHotkeySettingDialogOpen }

diff --git a/src/type/ipc.d.ts b/src/type/ipc.d.ts
@@ -97,6 +97,16 @@ type IpcIHData = {
     return: boolean;
   };
 
+  ENABLE_AUTO_UPDATE_CHECK: {
+    args: [obj: { newValue?: boolean }];
+    return: boolean;
+  };
+
+  UPDATE_CHECK: {
+    args: [];
+    return: void;
+  };
+
   IS_AVAILABLE_GPU_MODE: {
     args: [];
     return: boolean;

diff --git a/src/type/preload.d.ts b/src/type/preload.d.ts
@@ -37,6 +37,8 @@ export interface Sandbox {
   openTextEditContextMenu(): Promise<void>;
   useGpu(newValue?: boolean): Promise<boolean>;
   inheritAudioInfo(newValue?: boolean): Promise<boolean>;
+  enableAutoUpdateCheck(newValue?: boolean): Promise<boolean>;
+  updateCheck(): void;
   isAvailableGPUMode(): Promise<boolean>;
   onReceivedIPCMsg<T extends keyof IpcSOData>(
     channel: T,