整理: engine_manifest_assets/ をリソースディレクトリへ移動 (#1247)

refactor: `engine_manifest_assets/` をリソースディレクトリへ移動
VOICEVOX · May 20, 2024 · 0cfb336 · 0cfb336
1 parent 9b2944e
commit 0cfb336
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/build-engine-package.yml b/.github/workflows/build-engine-package.yml
@@ -445,10 +445,10 @@ jobs:
       # Build
       - name: <Build> Generate licenses.json
         run: |
-          OUTPUT_LICENSE_JSON_PATH=engine_manifest_assets/dependency_licenses.json \
+          OUTPUT_LICENSE_JSON_PATH=resources/engine_manifest_assets/dependency_licenses.json \
           bash build_util/create_venv_and_generate_licenses.bash
           # FIXME: VOICEVOX (editor) cannot build without licenses.json
-          cp engine_manifest_assets/dependency_licenses.json licenses.json
+          cp resources/engine_manifest_assets/dependency_licenses.json licenses.json
 
       - name: <Build> Build VOICEVOX ENGINE run.py
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -232,7 +232,6 @@ ADD ./resources /opt/voicevox_engine/resources
 ADD ./build_util/generate_licenses.py /opt/voicevox_engine/build_util/
 ADD ./speaker_info /opt/voicevox_engine/speaker_info
 ADD ./ui_template /opt/voicevox_engine/ui_template
-ADD ./engine_manifest_assets /opt/voicevox_engine/engine_manifest_assets
 
 # Replace version
 ARG VOICEVOX_ENGINE_VERSION=latest
@@ -251,8 +250,8 @@ RUN <<EOF
     export PATH="/home/user/.local/bin:${PATH:-}"
 
     gosu user /opt/python/bin/pip3 install -r /tmp/requirements-license.txt
-    gosu user /opt/python/bin/python3 build_util/generate_licenses.py > /opt/voicevox_engine/engine_manifest_assets/dependency_licenses.json
-    cp /opt/voicevox_engine/engine_manifest_assets/dependency_licenses.json /opt/voicevox_engine/licenses.json
+    gosu user /opt/python/bin/python3 build_util/generate_licenses.py > /opt/voicevox_engine/resources/engine_manifest_assets/dependency_licenses.json
+    cp /opt/voicevox_engine/resources/engine_manifest_assets/dependency_licenses.json /opt/voicevox_engine/licenses.json
 EOF
 
 # Keep this layer separated to use layer cache on download failed in local build

diff --git a/build_util/process_voicevox_resource.bash b/build_util/process_voicevox_resource.bash
@@ -20,13 +20,13 @@ mv engine_manifest.json.tmp engine_manifest.json
 
 # エンジンとリソースの更新情報を統合する
 python build_util/merge_update_infos.py \
-    engine_manifest_assets/update_infos.json \
+    resources/engine_manifest_assets/update_infos.json \
     "${DOWNLOAD_RESOURCE_PATH}/engine/engine_manifest_assets/update_infos.json" \
-    engine_manifest_assets/update_infos.json
+    resources/engine_manifest_assets/update_infos.json
 
 # リソースのマニフェストアセットをエンジンのディレクトリへ複製する
 for f in "${DOWNLOAD_RESOURCE_PATH}"/engine/engine_manifest_assets/*; do
     if [ "$(basename "${f}")" != "update_infos.json" ]; then
-        cp "${f}" ./engine_manifest_assets/
+        cp "${f}" ./resources/engine_manifest_assets/
     fi
 done
diff --git a/engine_manifest.json b/engine_manifest.json
@@ -7,12 +7,12 @@
     "url": "https://github.com/VOICEVOX/voicevox_engine",
     "command": "run",
     "port": 50021,
-    "icon": "engine_manifest_assets/icon.png",
+    "icon": "resources/engine_manifest_assets/icon.png",
     "default_sampling_rate": 24000,
     "frame_rate": 93.75,
-    "terms_of_service": "engine_manifest_assets/terms_of_service.md",
-    "update_infos": "engine_manifest_assets/update_infos.json",
-    "dependency_licenses": "engine_manifest_assets/dependency_licenses.json",
+    "terms_of_service": "resources/engine_manifest_assets/terms_of_service.md",
+    "update_infos": "resources/engine_manifest_assets/update_infos.json",
+    "dependency_licenses": "resources/engine_manifest_assets/dependency_licenses.json",
     "supported_features": {
         "adjust_mora_pitch": {
             "type": "bool",

diff --git a/..._manifest_assets/dependency_licenses.json → ..._manifest_assets/dependency_licenses.json b/..._manifest_assets/dependency_licenses.json → ..._manifest_assets/dependency_licenses.json
diff --git a/...nifest_assets/downloadable_libraries.json → ...nifest_assets/downloadable_libraries.json b/...nifest_assets/downloadable_libraries.json → ...nifest_assets/downloadable_libraries.json
diff --git a/engine_manifest_assets/icon.png → resources/engine_manifest_assets/icon.png b/engine_manifest_assets/icon.png → resources/engine_manifest_assets/icon.png
diff --git a/engine_manifest_assets/terms_of_service.md → ...ngine_manifest_assets/terms_of_service.md b/engine_manifest_assets/terms_of_service.md → ...ngine_manifest_assets/terms_of_service.md
diff --git a/engine_manifest_assets/update_infos.json → .../engine_manifest_assets/update_infos.json b/engine_manifest_assets/update_infos.json → .../engine_manifest_assets/update_infos.json
diff --git a/run.spec b/run.spec
@@ -5,7 +5,6 @@ import os
 
 datas = [
     ('resources', 'resources'),
-    ('engine_manifest_assets', 'engine_manifest_assets'),
     ('speaker_info', 'speaker_info'),
     ('engine_manifest.json', '.'),
     ('licenses.json', '.'),

diff --git a/voicevox_engine/library_manager.py b/voicevox_engine/library_manager.py
@@ -57,14 +57,14 @@ def downloadable_libraries(self) -> list[DownloadableLibraryInfo]:
 
         # == ダウンロード情報をjsonファイルから取得する場合
         # with open(
-        #     self.root_dir / "engine_manifest_assets" / "downloadable_libraries.json",
+        #     self.root_dir / "resources" / "engine_manifest_assets" / "downloadable_libraries.json", # noqa: B950
         #     encoding="utf-8",
         # ) as f:
         #     return list(map(DownloadableLibrary.parse_obj, json.load(f)))
 
         # ダミーとして、speaker_infoのアセットを読み込む
         with open(
-            "./engine_manifest_assets/downloadable_libraries.json",
+            "./resources/engine_manifest_assets/downloadable_libraries.json",
             encoding="utf-8",
         ) as f:
             libraries = json.load(f)