微調整

jdkfx · Jun 30, 2024 · fda0dbc · fda0dbc
1 parent 869a585
commit fda0dbc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/store/audio.ts b/src/store/audio.ts
@@ -23,6 +23,7 @@ import {
   formatCharacterStyleName,
   TuningTranscription,
   filterCharacterInfosByStyleType,
+  DEFAULT_PROJECT_NAME,
 } from "./utility";
 import { createPartialStore } from "./vuex";
 import { determineNextPresetKey } from "./preset";
@@ -1195,7 +1196,9 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
 
       const defaultFileBaseName = sanitizeFileName(headTailItemText);
 
-      return defaultFileBaseName === "" ? "Untitled" : defaultFileBaseName;
+      return defaultFileBaseName === ""
+        ? DEFAULT_PROJECT_NAME
+        : defaultFileBaseName;
     },
   },
 
@@ -1220,9 +1223,7 @@ export const audioStore = createPartialStore<AudioStoreTypes>({
       if (style == undefined) throw new Error("assert style != undefined");
 
       const styleName = style.styleName || DEFAULT_STYLE_NAME;
-
-      const projectName = getters.PROJECT_NAME ?? "";
-
+      const projectName = getters.PROJECT_NAME ?? DEFAULT_PROJECT_NAME;
       return buildAudioFileNameFromRawData(fileNamePattern, {
         characterName: character.metas.speakerName,
         index,

diff --git a/src/store/singing.ts b/src/store/singing.ts
@@ -22,7 +22,7 @@ import {
   SequencerEditTarget,
   PhraseSourceHash,
 } from "./type";
-import { sanitizeFileName } from "./utility";
+import { DEFAULT_PROJECT_NAME, sanitizeFileName } from "./utility";
 import { EngineId, NoteId, StyleId } from "@/type/preload";
 import { FrameAudioQuery, Note as NoteForRequestToEngine } from "@/openapi";
 import { ResultError, getValueOrThrow } from "@/type/result";
@@ -1895,7 +1895,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
         const generateDefaultSongFileName = () => {
           const projectName = getters.PROJECT_NAME;
           if (projectName) {
-            return projectName.split(".")[0] + ".wav";
+            return projectName + ".wav";
           }
 
           const singer = getters.SELECTED_TRACK.singer;
@@ -1915,7 +1915,7 @@ export const singingStore = createPartialStore<SingingStoreTypes>({
             }
           }
 
-          return "Untitled.wav";
+          return `${DEFAULT_PROJECT_NAME}.wav`;
         };
 
         const exportWaveFile = async (): Promise<SaveResultObject> => {

diff --git a/src/store/utility.ts b/src/store/utility.ts
@@ -11,6 +11,7 @@ import {
 import { AccentPhrase, Mora } from "@/openapi";
 
 export const DEFAULT_STYLE_NAME = "ノーマル";
+export const DEFAULT_PROJECT_NAME = "Untitled";
 
 export const formatCharacterStyleName = (
   characterName: string,
@@ -120,7 +121,7 @@ export const replaceTagIdToTagString = {
   styleName: "スタイル",
   text: "テキスト",
   date: "日付",
-  projectName: "プロジェクトファイル名",
+  projectName: "プロジェクト名",
 };
 const replaceTagStringToTagId: { [tagString: string]: string } = Object.entries(
   replaceTagIdToTagString,

diff --git a/tests/unit/store/utility.spec.ts b/tests/unit/store/utility.spec.ts
@@ -251,7 +251,7 @@ describe("isAccentPhrasesTextDifferent", () => {
 
 test("buildAudioFileNameFromRawData", () => {
   const fileNamePattern =
-    "index=$連番$ characterName=$キャラ$ text=$テキスト$ styleName=$スタイル$ date=$日付$ projectName=$プロジェクトファイル名$";
+    "index=$連番$ characterName=$キャラ$ text=$テキスト$ styleName=$スタイル$ date=$日付$ projectName=$プロジェクト名$";
   const vars = {
     index: 10,
     characterName: "キャラ１",