From 05926fbd02c210a8ef151420bc703a33b0fd293f Mon Sep 17 00:00:00 2001
From: sabonerune <102559104+sabonerune@users.noreply.github.com>
Date: Wed, 20 Mar 2024 09:15:09 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B8=E3=81=8D=E5=87=BA=E3=81=97?=
 =?UTF-8?q?=E5=85=88=E3=82=92=E5=9B=BA=E5=AE=9A=E3=82=92=E6=9C=89=E5=8A=B9?=
 =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E6=9B=B8?=
 =?UTF-8?q?=E3=81=8D=E5=87=BA=E3=81=97=E5=85=88=E3=81=8C=E6=9C=AA=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AF=E8=87=AA=E5=8B=95?=
 =?UTF-8?q?=E7=9A=84=E3=81=AB=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=20(#1881)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 書き出し先を固定を有効にしたときに書き出し先が未選択の場合は自動的にダイアログを表示する

* fix: ミス修正

* fix: FIXMEコメント追加

* FIX: コメント修正

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

* FIX: 最新バージョンに追従

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/backend/common/ConfigManager.ts     | 14 ++++++++++
 src/components/Dialog/SettingDialog.vue | 34 +++++++++++++++++++------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts
index 43f37c3112..1d3d56ea7a 100644
--- a/src/backend/common/ConfigManager.ts
+++ b/src/backend/common/ConfigManager.ts
@@ -123,6 +123,20 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
       return config;
     },
   ],
+  [
+    ">=0.17",
+    (config) => {
+      // 書き出し先のディレクトリが空文字の場合書き出し先固定を無効化する
+      // FIXME: 勝手に書き換えるのは少し不親切なので、ダイアログで書き換えたことを案内する
+      const savingSetting = config.savingSetting as ConfigType["savingSetting"];
+      if (
+        savingSetting.fixedExportEnabled &&
+        savingSetting.fixedExportDir === ""
+      ) {
+        savingSetting.fixedExportEnabled = false;
+      }
+    },
+  ],
 ];
 
 export type Metadata = {
diff --git a/src/components/Dialog/SettingDialog.vue b/src/components/Dialog/SettingDialog.vue
index 2333a86ea8..826386ac89 100644
--- a/src/components/Dialog/SettingDialog.vue
+++ b/src/components/Dialog/SettingDialog.vue
@@ -470,7 +470,7 @@
                       flat
                       color="primary"
                       icon="folder_open"
-                      @click="openFileExplore"
+                      @click="selectFixedExportDir()"
                     >
                       <QTooltip :delay="500" anchor="bottom left">
                         フォルダ選択
@@ -1011,7 +1011,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, ref, watchEffect } from "vue";
 import FileNamePatternDialog from "./FileNamePatternDialog.vue";
 import { useStore } from "@/store";
 import {
@@ -1289,17 +1289,35 @@ const outputSamplingRate = computed({
   },
 });
 
-const openFileExplore = async () => {
-  const path = await window.backend.showSaveDirectoryDialog({
+const openFileExplore = () => {
+  return window.backend.showSaveDirectoryDialog({
     title: "書き出し先のフォルダを選択",
   });
-  if (path) {
-    store.dispatch("SET_SAVING_SETTING", {
-      data: { ...savingSetting.value, fixedExportDir: path },
-    });
+};
+
+const selectFixedExportDir = async () => {
+  const path = await openFileExplore();
+  if (path != undefined) {
+    handleSavingSettingChange("fixedExportDir", path);
   }
 };
 
+// 書き出し先を固定を有効にしたときに書き出し先が未選択の場合は自動的にダイアログを表示する
+watchEffect(async () => {
+  if (
+    savingSetting.value.fixedExportEnabled &&
+    savingSetting.value.fixedExportDir === ""
+  ) {
+    const path = await openFileExplore();
+    if (path != undefined) {
+      handleSavingSettingChange("fixedExportDir", path);
+    } else {
+      // キャンセルした場合書き出し先の固定を無効化する
+      handleSavingSettingChange("fixedExportEnabled", false);
+    }
+  }
+});
+
 const [splitTextWhenPaste, changeSplitTextWhenPaste] =
   useRootMiscSetting("splitTextWhenPaste");