From 8d82be87de841e71f3a23b932118c4b9deb2c766 Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Sun, 21 Jan 2024 03:08:37 +0900 Subject: [PATCH] [release-0.15] to 0.15.0 (#1731) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修正漏れ * Revert "build: エンジンの配置ディレクトリを変更 (#1611)" This reverts commit bc1d6abf4cea18637b61cc87e93d3a0cc4fe69a1. * 更新情報を更新 * 。はいらない * 日本語を微調整 * バージョン更新 * vvlibへの対応状況を非表示に --- .env.production | 2 +- .github/workflows/build.yml | 14 ++++--- electron-builder.config.js | 4 +- public/howtouse.md | 2 +- public/qAndA.md | 4 ++ public/updateInfos.json | 57 +++++++++++++++++++++++++++ src/components/EngineManageDialog.vue | 19 ++++++--- src/shared/ConfigManager.ts | 1 + 8 files changed, 87 insertions(+), 16 deletions(-) diff --git a/.env.production b/.env.production index 5b0dcb0498..302d28852f 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VITE_DEFAULT_ENGINE_INFOS=`[ "uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d", "name": "VOICEVOX Engine", "executionEnabled": true, - "executionFilePath": "vv-engine/run.exe", + "executionFilePath": "run.exe", "executionArgs": [], "host": "http://127.0.0.1:50021" } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9769a612e..bb16ccca1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ on: env: VOICEVOX_ENGINE_REPO_URL: "https://github.com/VOICEVOX/voicevox_engine" - VOICEVOX_ENGINE_VERSION: 0.14.7 - VOICEVOX_RESOURCE_VERSION: 0.15.0-preview.3 + VOICEVOX_ENGINE_VERSION: 0.15.0 + VOICEVOX_RESOURCE_VERSION: 0.15.0 VOICEVOX_EDITOR_VERSION: |- # releaseタグ名か、workflow_dispatchでのバージョン名か、999.999.999-developが入る ${{ github.event.release.tag_name || github.event.inputs.version || '999.999.999-develop' }} @@ -278,24 +278,26 @@ jobs: - name: Merge VOICEVOX ENGINE into prepackage/ if: startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'linux-') run: | - mv voicevox_engine/ prepackage/vv-engine/ + mv voicevox_engine/* prepackage/ + rm -rf voicevox_engine - name: Merge VOICEVOX ENGINE into prepackage/VOICEVOX.app/Contents/MacOS/ if: startsWith(matrix.artifact_name, 'macos-') run: | - mv voicevox_engine/ prepackage/VOICEVOX.app/Contents/MacOS/vv-engine/ + mv voicevox_engine/* prepackage/VOICEVOX.app/Contents/MacOS/ + rm -rf voicevox_engine - name: Recover file permissions if: startsWith(matrix.artifact_name, 'linux-') # linux run: | chmod +x "prepackage/${{ matrix.linux_executable_name }}" - chmod +x "prepackage/vv-engine/run" + chmod +x "prepackage/run" - name: Recover file permissions for macOS build if: startsWith(matrix.artifact_name, 'macos-') # macOS run: | chmod +x "prepackage/VOICEVOX.app/Contents/MacOS/${{ matrix.macos_executable_name }}" - chmod +x "prepackage/VOICEVOX.app/Contents/MacOS/vv-engine/run" + chmod +x "prepackage/VOICEVOX.app/Contents/MacOS/run" chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (GPU).app/Contents/MacOS/VOICEVOX Helper (GPU)" chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (Plugin).app/Contents/MacOS/VOICEVOX Helper (Plugin)" chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (Renderer).app/Contents/MacOS/VOICEVOX Helper (Renderer)" diff --git a/electron-builder.config.js b/electron-builder.config.js index 5a35d053b6..8fa391c643 100644 --- a/electron-builder.config.js +++ b/electron-builder.config.js @@ -7,7 +7,7 @@ const dotenvPath = path.join(process.cwd(), ".env.production"); dotenv.config({ path: dotenvPath }); const VOICEVOX_ENGINE_DIR = - process.env.VOICEVOX_ENGINE_DIR ?? "../voicevox_engine/dist/run/"; + process.env.VOICEVOX_ENGINE_DIR ?? "../voicevox_engine/run.dist/"; // ${productName} Web Setup ${version}.${ext} const NSIS_WEB_ARTIFACT_NAME = process.env.NSIS_WEB_ARTIFACT_NAME; @@ -90,7 +90,7 @@ const builderOptions = { }, { from: VOICEVOX_ENGINE_DIR, - to: path.join(extraFilePrefix, "vv-engine"), + to: extraFilePrefix, }, { from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile), diff --git a/public/howtouse.md b/public/howtouse.md index b0016e7a74..bf48a43519 100644 --- a/public/howtouse.md +++ b/public/howtouse.md @@ -105,7 +105,7 @@ GPU をお持ちの方は、音声の生成がずっと速い GPU モードを 画面の右の欄で、テキスト欄ごとに話速や抑揚などのパラメータを変更することができます。 -「イントネーション」をクリックして現れる縦線のバー +右側にパラメータを調整する欄が表示されています。 - 話速 - 読み上げ速度を変更できます。数値が大きいほど速くなります。 diff --git a/public/qAndA.md b/public/qAndA.md index 37b3e487fc..3c00aa343c 100644 --- a/public/qAndA.md +++ b/public/qAndA.md @@ -80,6 +80,10 @@ DirectML 対応の GPU を搭載した Windows PC と、Nvidia 製 GPU 搭載の お使いいただけます。 +### Q. 辞書をインポート／エクスポートしたいです + +起動中のエンジンの設定画面で行えます。ソフトウェア起動中にブラウザから`http://127.0.0.1:[エンジンのポート番号]/setting`にアクセスするとエンジンの設定画面が開きます。エンジンのポート番号はデフォルトで`50021`です。 + ## 不具合・エラーに関する質問 ### Q. バグを見つけました。どこに報告すれば良いですか？ diff --git a/public/updateInfos.json b/public/updateInfos.json index 60f9a68d3f..62e910656a 100644 --- a/public/updateInfos.json +++ b/public/updateInfos.json @@ -1,4 +1,61 @@ [ + { + "version": "0.15.0", + "descriptions": [ + "デフォルトプリセット機能", + "最近開いたプロジェクト一覧を追加", + "行番号を表示するオプションを追加", + "自動でポートを変更するように", + "メモ機能・ルビ機能", + "テキスト追加ボタンの非表示機能", + "複数選択機能", + "アップデート通知機能", + "開発環境の向上", + "バグ修正" + ], + "contributors": [ + "aoirint", + "finict", + "FujisakiEx", + "g-Ratie", + "henteko", + "Hiroshiba", + "Jun-1Il", + "k-chop", + "kebin628", + "K-shir0", + "liszt01", + "madosuki", + "My-MC", + "nagi-miaow", + "nmori", + "nohimazin", + "okaits", + "raa0121", + "risu729", + "sabonerune", + "sevenc-nanashi", + "shm11C3", + "siketyan", + "sousuke0422", + "stmtk1", + "takana-v", + "tarepan", + "thiramisu", + "Tksn07", + "tomoish", + "tuna2134", + "tunamaguro", + "umi1299", + "wappon28dev", + "weweweok", + "whiteball", + "yamachu", + "y-chan", + "yncat", + "yuriko0505" + ] + }, { "version": "0.14.11", "descriptions": [ diff --git a/src/components/EngineManageDialog.vue b/src/components/EngineManageDialog.vue index 3c8740bcfd..9084ec98b7 100644 --- a/src/components/EngineManageDialog.vue +++ b/src/components/EngineManageDialog.vue @@ -275,16 +275,23 @@ engineManifests[selectedId].supportedFeatures " > -
  • - {{ getFeatureName(feature) }}：{{ value ? "対応" : "非対応" }} -
    • + +
  • + {{ getFeatureName(feature) }}：{{ + value ? "対応" : "非対応" + }} +
    • + （取得に失敗しました） @@ -461,7 +468,7 @@ const getFeatureName = (name: keyof SupportedFeatures) => { adjustIntonationScale: "全体の抑揚の調整", adjustVolumeScale: "全体の音量の調整", interrogativeUpspeak: "疑問文の自動調整", - synthesisMorphing: "2人の話者でモーフィングした音声を合成", + synthesisMorphing: "2種類のスタイルでモーフィングした音声を合成", manageLibrary: "音声ライブラリ(vvlib)の管理", }; return featureNameMap[name]; diff --git a/src/shared/ConfigManager.ts b/src/shared/ConfigManager.ts index 3e38ce1f36..e037e6e148 100644 --- a/src/shared/ConfigManager.ts +++ b/src/shared/ConfigManager.ts @@ -92,6 +92,7 @@ const migrations: [string, (store: Record) => unknown][] = [ [ ">=0.15", (config) => { + // 一つだけ書き出し → 選択音声を書き出し const hotkeySettings = config.hotkeySettings as ConfigType["hotkeySettings"]; const newHotkeySettings: ConfigType["hotkeySettings"] =