Skip to content

Commit

Permalink
Update: 最低限必要な箇所だけを VOICEVOX / VOICEVOX ENGINE から AivisSpeech / Aivis…
Browse files Browse the repository at this point in the history
…Speech Engine にリブランド

概ねすべて変更できているはず (問題があれば都度直す)
  • Loading branch information
tsukumijima committed Mar 4, 2024
1 parent ce866de commit 71979b0
Show file tree
Hide file tree
Showing 70 changed files with 257 additions and 1,028 deletions.
14 changes: 7 additions & 7 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
VITE_APP_NAME=voicevox
VITE_APP_NAME=AivisSpeech
VITE_DEFAULT_ENGINE_INFOS=`[
{
"uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d",
"name": "VOICEVOX Engine",
"uuid": "1b4a5014-d9fd-11ee-b97d-83c170a68ed3",
"name": "AivisSpeech Engine",
"executionEnabled": true,
"executionFilePath": "vv-engine/run.exe",
"executionFilePath": "AivisSpeech-Engine/run.exe",
"executionArgs": [],
"host": "http://127.0.0.1:50021"
"host": "http://127.0.0.1:10101"
}
]`
VITE_OFFICIAL_WEBSITE_URL=https://voicevox.hiroshiba.jp/
VITE_LATEST_UPDATE_INFOS_URL=https://raw.githubusercontent.com/VOICEVOX/voicevox_blog/master/src/data/updateInfos.json
VITE_OFFICIAL_WEBSITE_URL=https://github.com/Aivis-Project/AivisSpeech
VITE_LATEST_UPDATE_INFOS_URL=https://raw.githubusercontent.com/Aivis-Project/AivisSpeech/master/public/updateInfos.json
VITE_GTM_CONTAINER_ID=GTM-DUMMY
14 changes: 7 additions & 7 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
VITE_APP_NAME=voicevox
VITE_APP_NAME=AivisSpeech
VITE_DEFAULT_ENGINE_INFOS=`[
{
"uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d",
"name": "VOICEVOX Engine",
"uuid": "1b4a5014-d9fd-11ee-b97d-83c170a68ed3",
"name": "AivisSpeech Engine",
"executionEnabled": true,
"executionFilePath": "../voicevox_engine/run.exe",
"executionFilePath": "../AivisSpeech-Engine/run.exe",
"executionArgs": [],
"host": "http://127.0.0.1:50021"
"host": "http://127.0.0.1:10101"
}
]`
VITE_OFFICIAL_WEBSITE_URL=https://voicevox.hiroshiba.jp/
VITE_LATEST_UPDATE_INFOS_URL=https://raw.githubusercontent.com/VOICEVOX/voicevox_blog/master/src/data/updateInfos.json
VITE_OFFICIAL_WEBSITE_URL=https://github.com/Aivis-Project/AivisSpeech
VITE_LATEST_UPDATE_INFOS_URL=https://raw.githubusercontent.com/Aivis-Project/AivisSpeech/master/public/updateInfos.json
VITE_GTM_CONTAINER_ID=GTM-DUMMY
1 change: 0 additions & 1 deletion .github/CODEOWNERS

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bugreport.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ labels: バグ

<!-- 正しいと思う動作が明確であれば記載してください -->

## VOICEVOXのバージョン
## AivisSpeechのバージョン

0.?.0

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/featurerequest.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ labels: 機能向上

<!-- 実現方法について検討済みであるなら -->

## VOICEVOXのバージョン
## AivisSpeechのバージョン

0.?.0

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ labels: question

<!-- ここに記載してください -->

## VOICEVOXのバージョン
## AivisSpeechのバージョン

0.?.0

Expand Down
14 changes: 7 additions & 7 deletions .github/actions/download-engine/action.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: "Download VOICEVOX ENGINE"
name: "Download AivisSpeech Engine"
description: |
VOICEVOX ENGINEをダウンロードし、指定したディレクトリに展開する。
AivisSpeech Engineをダウンロードし、指定したディレクトリに展開する。
inputs:
repo:
description: "リポジトリ名。デフォルトはVOICEVOX/voicevox_engine"
description: "リポジトリ名。デフォルトは Aivis-Project/AivisSpeech-Engine "
required: false
default: "VOICEVOX/voicevox_engine"
default: "Aivis-Project/AivisSpeech-Engine"
version:
description: "VOICEVOX ENGINEのバージョン。latest(デフォルト)、prerelease-latest、バージョン番号(例:0.14.4)で指定できる。"
description: "AivisSpeech Engineのバージョン。latest(デフォルト)、prerelease-latest、バージョン番号(例:1.0.0)で指定できる。"
required: false
default: "latest"
dest:
description: "VOICEVOX ENGINEを展開するディレクトリ"
description: "AivisSpeech Engineを展開するディレクトリ"
required: true
target:
description: "ダウンロードする対象。デフォルトは各OSのCPU版。"
Expand All @@ -23,7 +23,7 @@ outputs:
description: "run.exe、またはrunのパス。"
value: ${{ steps.result.outputs.run_path }}
version:
description: "VOICEVOX ENGINEのバージョン"
description: "AivisSpeech Engineのバージョン"
value: ${{ steps.result.outputs.version }}
runs:
using: "composite"
Expand Down
141 changes: 70 additions & 71 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

28 changes: 12 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:
workflow_dispatch:

env:
VOICEVOX_ENGINE_REPO: "VOICEVOX/voicevox_nemo_engine" # 軽いのでNemoを使う
VOICEVOX_ENGINE_VERSION: "0.14.0"
AIVISSPEECH_ENGINE_REPO: "Aivis-Project/AivisSpeech-Engine"
AIVISSPEECH_ENGINE_VERSION: "1.0.0"

defaults:
run:
Expand Down Expand Up @@ -68,11 +68,11 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
include:
- os: ubuntu-latest
voicevox_engine_asset_name: linux-cpu
aivisspeech_engine_asset_name: linux-cpu
- os: macos-latest
voicevox_engine_asset_name: macos-x64
aivisspeech_engine_asset_name: macos-x64
- os: windows-latest
voicevox_engine_asset_name: windows-cpu
aivisspeech_engine_asset_name: windows-cpu
steps:
- uses: actions/checkout@v3
- name: Setup environment
Expand All @@ -85,14 +85,14 @@ jobs:
sudo apt-get install -y xvfb x11-xserver-utils # for electron
sudo apt-get install -y libsndfile1 # for engine
- name: Download VOICEVOX ENGINE
- name: Download AivisSpeech Engine
id: download-engine
uses: ./.github/actions/download-engine
with:
repo: ${{ env.VOICEVOX_ENGINE_REPO }}
version: ${{ env.VOICEVOX_ENGINE_VERSION }}
dest: ${{ github.workspace }}/voicevox_engine
target: ${{ matrix.voicevox_engine_asset_name }}
repo: ${{ env.AIVISSPEECH_ENGINE_REPO }}
version: ${{ env.AIVISSPEECH_ENGINE_VERSION }}
dest: ${{ github.workspace }}/AivisSpeech-Engine
target: ${{ matrix.aivisspeech_engine_asset_name }}

- name: Setup
run: |
Expand All @@ -104,11 +104,7 @@ jobs:
# .env
sed -i -e 's|"074fc39e-678b-4c13-8916-ffca8d505d1d"|"208cf94d-43d2-4cf5-abc0-9783cac36d29"|' .env.test
sed -i -e 's|"../voicevox_engine/run.exe"|"${{ steps.download-engine.outputs.run_path }}"|' .env.test
# GitHub Actions 環境だとたまに50021が封じられていることがあるので、ランダムなポートを使うようにする
PORT=$(node -r net -e "server=net.createServer();server.listen(0,()=>{console.log(server.address().port);server.close()})")
sed -i -e 's|"host": "http://127.0.0.1:50021"|"host": "http://127.0.0.1:'$PORT'"|' .env.test
sed -i -e 's|"executionArgs": \[\],|"executionArgs": ["--port='$PORT'"],|' .env.test
sed -i -e 's|"../AivisSpeech-Engine/run.exe"|"${{ steps.download-engine.outputs.run_path }}"|' .env.test
cp .env.test .env
- name: Run npm run test:browser-e2e
Expand Down Expand Up @@ -197,7 +193,7 @@ jobs:
uses: ./.github/actions/setup-environment

- name: Disallowed licenses check
run: npm run license:generate -- -o voicevox_licenses.json
run: npm run license:generate -- -o aivisspeech_licenses.json

- run: npm run typecheck
- run: npm run lint
Expand Down
2 changes: 1 addition & 1 deletion build/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

ダミー謝辞

[ダミーリンク](https://voicevox.hiroshiba.jp/)
[ダミーリンク](https://github.com/Aivis-Project/AivisSpeech)
4 changes: 2 additions & 2 deletions build/funcs.nsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!ifndef VOICEVOX_FUNCS_INCLUDED
!define VOICEVOX_FUNCS_INCLUDED
!ifndef AIVISSPEECH_FUNCS_INCLUDED
!define AIVISSPEECH_FUNCS_INCLUDED

; このファイルには独自に定義した定数や変数には依存しない処理だけをまとめておく

Expand Down
6 changes: 3 additions & 3 deletions build/installer.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
!include "FileFunc.nsh"
!include "funcs.nsh"

; voicevox-X.X.X-x64.nsis.7z.ini などが配置されている場所
; AivisSpeech-X.X.X-x64.nsis.7z.ini などが配置されている場所
; 開発中はここを一時的に差し替えて、out フォルダ内で npx http-server などとするとテストしやすい
; !define DOWNLOAD_BASE_URL "http://127.0.0.1:8080"
!define DOWNLOAD_BASE_URL "${APP_PACKAGE_URL}"
Expand Down Expand Up @@ -33,7 +33,7 @@
; "Concatenate" - ファイルの結合のみを行う
Var additionalProcess

; voicevox-X.X.X-x64.nsis.7z のようなファイル名
; AivisSpeech-X.X.X-x64.nsis.7z のようなファイル名
Var archiveName
; SHA2-512 でのハッシュ値
Var archiveHash
Expand Down Expand Up @@ -784,7 +784,7 @@ FunctionEnd
!macroend

!macro customHeader
; インストール成功後に%LOCALAPPDATA%\voicevox-updater\を削除する
; インストール成功後に%LOCALAPPDATA%\AivisSpeech-updater\を削除する
Function .onInstSuccess
; https://github.com/electron-userland/electron-builder/blob/f717e0ea67cec7c5c298889efee7df724838491a/packages/app-builder-lib/templates/nsis/include/installer.nsh#L77
${if} $installMode == "all"
Expand Down
54 changes: 27 additions & 27 deletions build/installer_linux.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# VOICEVOX Installer Script
# AivisSpeech Installer Script

# set -x # Debug mode: output verbose log
set -euo pipefail
Expand All @@ -17,7 +17,7 @@ _readarray(){

cat << 'BANNER'
+-+-+-+-+-+-+-+-+
|V|O|I|C|E|V|O|X|
|A|i|v|i|s|S|p|e|e|c|h|
+-+-+-+-+-+-+-+-+-+-+-+-+-+
|I|n|s|t|a|l|l|e|r|
+-+-+-+-+-+-+-+-+-+-+-+-+-+
Expand All @@ -27,10 +27,10 @@ BANNER

NAME=$(basename "${NAME:-linux-nvidia-appimage}")
VERSION=$(basename "${VERSION:-}")
REPO_URL=${REPO_URL:-https://github.com/VOICEVOX/voicevox}
REPO_URL=${REPO_URL:-https://github.com/Aivis-Project/AivisSpeech}

# Install directory
APP_DIR=${APP_DIR:-$HOME/.voicevox}
APP_DIR=${APP_DIR:-$HOME/.aivisspeech}
# force install if [ ${FORCE_INSTALL} = 1 ]
FORCE_INSTALL=${FORCE_INSTALL:-}
# keep archive if [ ${KEEP_ARCHIVE} = 1 ]
Expand All @@ -43,8 +43,8 @@ DESKTOP_ENTRY_INSTALL_DIR=${DESKTOP_ENTRY_INSTALL_DIR:-$HOME/.local/share/applic
ICON_INSTALL_DIR=${ICON_INSTALL_DIR:-$HOME/.local/share/icons}
MIME_INSTALL_DIR=${MIME_INSTALL_DIR:-$HOME/.local/share/mime}

if [ "$FORCE_INSTALL" != "1" ] && [ -f "${APP_DIR}/VOICEVOX.AppImage" ]; then
echo "[*] VOICEVOX already installed in '${APP_DIR}/VOICEVOX.AppImage'."
if [ "$FORCE_INSTALL" != "1" ] && [ -f "${APP_DIR}/AivisSpeech.AppImage" ]; then
echo "[*] AivisSpeech already installed in '${APP_DIR}/AivisSpeech.AppImage'."
while true; do
read -r -p "[*] Replace?(y/n): " yn
case "$yn" in
Expand All @@ -67,7 +67,7 @@ if ! command -v curl &> /dev/null; then
cat << EOS && exit 1
[!] Command 'curl' not found
Required to download VOICEVOX
Required to download AivisSpeech
Ubuntu/Debian:
sudo apt install curl
Expand Down Expand Up @@ -162,7 +162,7 @@ EOS
cat << 'EOS'
[!] libsndfile: not found
Required to run VOICEVOX ENGINE
Required to run AivisSpeech Engine
Ubuntu/Debian:
sudo apt install libsndfile1
Expand Down Expand Up @@ -331,27 +331,27 @@ IFS=\$'\n\t'
cat << 'BANNER'
+-+-+-+-+-+-+-+-+
|V|O|I|C|E|V|O|X|
|A|i|v|i|s|S|p|e|e|c|h|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|U|n|i|n|s|t|a|l|l|e|r|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|f|o|r| |L|i|n|u|x|
+-+-+-+-+-+-+-+-+-+
BANNER
VOICEVOX_INSTALLED_FILES=(
"${DESKTOP_ENTRY_INSTALL_DIR}/voicevox.desktop"
"${ICON_INSTALL_DIR}/voicevox.png"
"${ICON_INSTALL_DIR}/hicolor/0x0/apps/voicevox.png"
"${MIME_INSTALL_DIR}/packages/voicevox.xml"
AIVISSPEECH_INSTALLED_FILES=(
"${DESKTOP_ENTRY_INSTALL_DIR}/aivisspeech.desktop"
"${ICON_INSTALL_DIR}/aivisspeech.png"
"${ICON_INSTALL_DIR}/hicolor/0x0/apps/aivisspeech.png"
"${MIME_INSTALL_DIR}/packages/aivisspeech.xml"
)
VOICEVOX_INSTALLED_DIR=(
AIVISSPEECH_INSTALLED_DIR=(
"${APP_DIR}"
)
echo "[+] Uninstalling VOICEVOX..."
for i in "\${VOICEVOX_INSTALLED_FILES[@]}"; do
echo "[+] Uninstalling AivisSpeech..."
for i in "\${AIVISSPEECH_INSTALLED_FILES[@]}"; do
[ -e "\$i" ] || continue
echo "[+] Removing '\${i}'..."
if [ -f "\$i" ]; then
Expand All @@ -362,7 +362,7 @@ for i in "\${VOICEVOX_INSTALLED_FILES[@]}"; do
fi
done
for i in "\${VOICEVOX_INSTALLED_DIR[@]}"; do
for i in "\${AIVISSPEECH_INSTALLED_DIR[@]}"; do
[ -e "\$i" ] || continue
echo "[+] Removing '\${i}'..."
if [ -d "\$i" ]; then
Expand All @@ -373,7 +373,7 @@ for i in "\${VOICEVOX_INSTALLED_DIR[@]}"; do
fi
done
echo "[+] Done! VOICEVOX has been uninstalled."
echo "[+] Done! AivisSpeech has been uninstalled."
EOS

Expand Down Expand Up @@ -422,29 +422,29 @@ cp squashfs-root/*.png "${ICON_INSTALL_DIR}"
echo "[+] Registering file association..."

mkdir -p "${MIME_INSTALL_DIR}/packages"
cat << EOS > "${MIME_INSTALL_DIR}/packages/voicevox.xml"
cat << EOS > "${MIME_INSTALL_DIR}/packages/aivisspeech.xml"
<?xml version="1.0" encoding="utf-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-voicevox">
<comment>VOICEVOX Project file</comment>
<comment xml:lang="ja">VOICEVOX プロジェクトファイル</comment>
<mime-type type="application/x-aivisspeech">
<comment>AivisSpeech Project file</comment>
<comment xml:lang="ja">AivisSpeech プロジェクトファイル</comment>
<sub-class-of type="application/json" />
<glob pattern="*.vvproj" />
<icon name="voicevox" />
<icon name="aivisspeech" />
</mime-type>
<mime-type type="application/x-voicevox-plugin-package">
<comment>VOICEVOX Plugin package</comment>
<comment xml:lang="ja">VOICEVOX プラグインパッケージ</comment>
<sub-class-of type="application/zip" />
<glob pattern="*.vvpp" />
<icon name="voicevox" />
<icon name="aivisspeech" />
</mime-type>
<mime-type type="application/x-voicevox-plugin-package-part">
<comment>VOICEVOX Plugin package (part)</comment>
<comment xml:lang="ja">VOICEVOX プラグインパッケージ(分割)</comment>
<sub-class-of type="application/zip" />
<glob pattern="*.vvppp" />
<icon name="voicevox" />
<icon name="aivisspeech" />
</mime-type>
</mime-info>
EOS
Expand All @@ -469,4 +469,4 @@ fi
echo "[+] Removing temporal directory..."
rm -rf squashfs-root

echo "[+] All done! VOICEVOX ${VERSION} has been installed under '${APP_DIR}'."
echo "[+] All done! AivisSpeech ${VERSION} has been installed under '${APP_DIR}'."
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ services:
# After node_modules install, use command bellow to exec "/bin/sh" and the container will remain.
# `docker-compose up -d`
# To access container, use command bellow
# `docker exec -it voicevox_test_1 /bin/bash`
# `docker exec -it aivisspeech_test_1 /bin/bash`

# command: "/bin/sh"


# If you want test automatically (test runs when you save any files), use this command property and view logs
# Use Command bellow
# `docker logs --tail 1000 -f voicevox_test_1`
# `docker logs --tail 1000 -f aivisspeech_test_1`

command: "npm run test-watch:unit "
ports:
Expand Down
Loading

0 comments on commit 71979b0

Please sign in to comment.