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

---
 src/backend/common/ConfigManager.ts     |  9 +++++++
 src/components/Dialog/SettingDialog.vue | 34 +++++++++++++++++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts
index 43f37c3112..adb8c1f83f 100644
--- a/src/backend/common/ConfigManager.ts
+++ b/src/backend/common/ConfigManager.ts
@@ -123,6 +123,15 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
       return config;
     },
   ],
+  [
+    ">=0.16",
+    (config) => {
+      // 書き出し先のディレクトリが空文字の場合書き出し先固定を無効化する
+      if (config.fixedExportEnabled && config.fixedExportDir === "") {
+        config.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");
 

From a2edeb28222f8cd4fc852317ff8a91f692f8bb85 Mon Sep 17 00:00:00 2001
From: sabonerune <102559104+sabonerune@users.noreply.github.com>
Date: Fri, 1 Mar 2024 21:43:14 +0900
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E3=83=9F=E3=82=B9=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/common/ConfigManager.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts
index adb8c1f83f..6070f81673 100644
--- a/src/backend/common/ConfigManager.ts
+++ b/src/backend/common/ConfigManager.ts
@@ -127,8 +127,12 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
     ">=0.16",
     (config) => {
       // 書き出し先のディレクトリが空文字の場合書き出し先固定を無効化する
-      if (config.fixedExportEnabled && config.fixedExportDir === "") {
-        config.fixedExportEnabled = false;
+      const savingSetting = config.savingSetting as ConfigType["savingSetting"];
+      if (
+        savingSetting.fixedExportEnabled &&
+        savingSetting.fixedExportDir === ""
+      ) {
+        savingSetting.fixedExportEnabled = false;
       }
     },
   ],

From ecd7b7572a8659b06d875b96d8675ef4cff64a7d Mon Sep 17 00:00:00 2001
From: sabonerune <102559104+sabonerune@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:27:30 +0900
Subject: [PATCH 3/5] =?UTF-8?q?fix:=20FIXME=E3=82=B3=E3=83=A1=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/common/ConfigManager.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts
index 6070f81673..a42d241e75 100644
--- a/src/backend/common/ConfigManager.ts
+++ b/src/backend/common/ConfigManager.ts
@@ -127,6 +127,7 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
     ">=0.16",
     (config) => {
       // 書き出し先のディレクトリが空文字の場合書き出し先固定を無効化する
+      // FIXME: ダイアログで案内する
       const savingSetting = config.savingSetting as ConfigType["savingSetting"];
       if (
         savingSetting.fixedExportEnabled &&

From b619d308ebd4e3e46b94f33115cadfa3e8466a8d Mon Sep 17 00:00:00 2001
From: sabonerune <102559104+sabonerune@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:33:07 +0900
Subject: [PATCH 4/5] =?UTF-8?q?FIX:=20=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/backend/common/ConfigManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts
index a42d241e75..b9f3f226ad 100644
--- a/src/backend/common/ConfigManager.ts
+++ b/src/backend/common/ConfigManager.ts
@@ -127,7 +127,7 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
     ">=0.16",
     (config) => {
       // 書き出し先のディレクトリが空文字の場合書き出し先固定を無効化する
-      // FIXME: ダイアログで案内する
+      // FIXME: 勝手に書き換えるのは少し不親切なので、ダイアログで書き換えたことを案内する
       const savingSetting = config.savingSetting as ConfigType["savingSetting"];
       if (
         savingSetting.fixedExportEnabled &&

From 8238f4c63feb634815ce84ecb459c452978fbce3 Mon Sep 17 00:00:00 2001
From: sabonerune <102559104+sabonerune@users.noreply.github.com>
Date: Tue, 12 Mar 2024 18:33:30 +0900
Subject: [PATCH 5/5] =?UTF-8?q?FIX:=20=E6=9C=80=E6=96=B0=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AB=E8=BF=BD=E5=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
---
 src/backend/common/ConfigManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/common/ConfigManager.ts b/src/backend/common/ConfigManager.ts
index b9f3f226ad..1d3d56ea7a 100644
--- a/src/backend/common/ConfigManager.ts
+++ b/src/backend/common/ConfigManager.ts
@@ -124,7 +124,7 @@ const migrations: [string, (store: Record<string, unknown>) => unknown][] = [
     },
   ],
   [
-    ">=0.16",
+    ">=0.17",
     (config) => {
       // 書き出し先のディレクトリが空文字の場合書き出し先固定を無効化する
       // FIXME: 勝手に書き換えるのは少し不親切なので、ダイアログで書き換えたことを案内する