Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

複数選択：話者変更するとAudioQueryのテキストがAudioCellのテキストと一致しなくなるバグを修正 #1665

Merged
merged 6 commits into from
Dec 14, 2023
Merged

複数選択：話者変更するとAudioQueryのテキストがAudioCellのテキストと一致しなくなるバグを修正 #1665

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f49ea79
Fix: 複数話者変更するとAudioQueryのテキストと一致しなくなるバグを修正
sevenc-nanashi Dec 2, 2023
be53ab4
Fix: mutationを一つに
sevenc-nanashi Dec 3, 2023
53d7d58
Change: レビューを反映
sevenc-nanashi Dec 5, 2023
8b40e92
Change: 記号を統一
sevenc-nanashi Dec 5, 2023
85c8ab5
Add: プリセット処理を追加
sevenc-nanashi Dec 13, 2023
978affe
Delete: 不要な条件分岐を削除
sevenc-nanashi Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 101 additions & 76 deletions src/store/audio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,57 +2011,62 @@ export const audioCommandStore = transformCommandStore(

COMMAND_MULTI_CHANGE_VOICE: {
mutation(
draft,
payload: { audioKeys: AudioKey[]; voice: Voice } & (
| { update: "RollbackStyleId" }
| {
update: "AccentPhrases";
accentPhrases: AccentPhrase[];
}
| {
update: "AudioQuery";
query: AudioQuery;
}
)
) {
for (const audioKey of payload.audioKeys) {
audioStore.mutations.SET_AUDIO_VOICE(draft, {
audioKey,
voice: payload.voice,
});
state,
payload: {
voice: Voice;
changes: Record<
AudioKey,
| {
update: "AccentPhrases";
accentPhrases: AccentPhrase[];
}
| {
update: "AudioQuery";
query: AudioQuery;
}
| {
update: "OnlyVoice";
}
>;
}
) {
for (const [audioKey_, change] of Object.entries(payload.changes)) {
// TypeScriptは`Object.entries`のKeyの型を`string`としてしまうので、`as`で型を指定する
const audioKey = audioKey_ as AudioKey;

if (payload.update === "RollbackStyleId") return;

for (const audioKey of payload.audioKeys) {
const presetKey = draft.audioItems[audioKey].presetKey;
const presetKey = state.audioItems[audioKey].presetKey;

const { nextPresetKey, shouldApplyPreset } = determineNextPresetKey(
draft,
state,
payload.voice,
presetKey,
"changeVoice"
);

audioStore.mutations.SET_AUDIO_PRESET_KEY(draft, {
if (shouldApplyPreset) {
audioStore.mutations.SET_AUDIO_PRESET_KEY(state, {
audioKey,
presetKey: nextPresetKey,
});
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

セットする時はshouldApplyPresetのチェックいらないかもです！
MULTI化する前のCOMMAND_CHANGE_VOICEのコードに合わせればいいはずかなと
https://github.com/VOICEVOX/voicevox/pull/1228/files#diff-b86b438c7928773aac473007988ffb602afc8278b8e2226ce784442befb46b0dR2096


audioStore.mutations.SET_AUDIO_VOICE(state, {
audioKey,
presetKey: nextPresetKey,
voice: payload.voice,
});

if (payload.update == "AccentPhrases") {
audioStore.mutations.SET_ACCENT_PHRASES(draft, {
if (change.update == "AccentPhrases") {
audioStore.mutations.SET_ACCENT_PHRASES(state, {
audioKey,
accentPhrases: payload.accentPhrases,
accentPhrases: change.accentPhrases,
});
} else if (payload.update == "AudioQuery") {
audioStore.mutations.SET_AUDIO_QUERY(draft, {
} else if (change.update == "AudioQuery") {
audioStore.mutations.SET_AUDIO_QUERY(state, {
audioKey,
audioQuery: payload.query,
audioQuery: change.query,
});
}

if (shouldApplyPreset) {
audioStore.mutations.APPLY_AUDIO_PRESET(draft, {
audioStore.mutations.APPLY_AUDIO_PRESET(state, {
audioKey,
});
}
Expand All @@ -2074,50 +2079,70 @@ export const audioCommandStore = transformCommandStore(
const engineId = voice.engineId;
const styleId = voice.styleId;
await dispatch("SETUP_SPEAKER", { audioKeys, engineId, styleId });
await Promise.all(
audioKeys.map(async (audioKey) => {
try {
const query = state.audioItems[audioKey].query;
if (query != undefined) {
const accentPhrases = query.accentPhrases;
const newAccentPhrases: AccentPhrase[] = await dispatch(
"FETCH_MORA_DATA",
{
accentPhrases,
engineId,
styleId,
}
);
commit("COMMAND_MULTI_CHANGE_VOICE", {
audioKeys,
voice,
update: "AccentPhrases",
accentPhrases: newAccentPhrases,
});
} else {
const text = state.audioItems[audioKey].text;
const query: AudioQuery = await dispatch("FETCH_AUDIO_QUERY", {
text: text,
engineId,
styleId,
});
commit("COMMAND_MULTI_CHANGE_VOICE", {
audioKeys,
voice,
update: "AudioQuery",
query,
});
}
} catch (error) {
commit("COMMAND_MULTI_CHANGE_VOICE", {
audioKeys,
voice,
update: "RollbackStyleId",
const errors: Record<AudioKey, unknown> = {};
const changes: Record<
AudioKey,
| {
update: "AccentPhrases";
accentPhrases: AccentPhrase[];
}
| {
update: "AudioQuery";
query: AudioQuery;
}
| {
update: "OnlyVoice";
}
> = {};

for (const audioKey of audioKeys) {
try {
const audioItem = state.audioItems[audioKey];
if (audioItem.query == undefined) {
const query: AudioQuery = await dispatch("FETCH_AUDIO_QUERY", {
text: audioItem.text,
engineId: voice.engineId,
styleId: voice.styleId,
});
throw error;
changes[audioKey] = {
update: "AudioQuery",
query,
};
} else {
const newAccentPhrases: AccentPhrase[] = await dispatch(
"FETCH_MORA_DATA",
{
accentPhrases: audioItem.query.accentPhrases,
engineId: voice.engineId,
styleId: voice.styleId,
}
);

changes[audioKey] = {
update: "AccentPhrases",
accentPhrases: newAccentPhrases,
};
}
})
);
} catch (error) {
errors[audioKey] = error;
changes[audioKey] = {
update: "OnlyVoice",
};
}
}

commit("COMMAND_MULTI_CHANGE_VOICE", {
voice,
changes,
});

if (Object.keys(errors).length > 0) {
throw new Error(
`話者の変更に失敗しました：\n${Object.entries(errors)
.map(([audioKey, error]) => `${audioKey}：${error}`)
.join("\n")}`
);
}
},
},

Expand Down
28 changes: 17 additions & 11 deletions src/store/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,17 +502,23 @@ export type AudioCommandStoreTypes = {
};

COMMAND_MULTI_CHANGE_VOICE: {
mutation: { audioKeys: AudioKey[]; voice: Voice } & (
| { update: "RollbackStyleId" }
| {
update: "AccentPhrases";
accentPhrases: AccentPhrase[];
}
| {
update: "AudioQuery";
query: AudioQuery;
}
);
mutation: {
voice: Voice;
changes: Record<
AudioKey,
| {
update: "AccentPhrases";
accentPhrases: AccentPhrase[];
}
| {
update: "AudioQuery";
query: AudioQuery;
}
| {
update: "OnlyVoice";
}
>;
};
action(payload: { audioKeys: AudioKey[]; voice: Voice }): void;
};

Expand Down