diff --git a/Dockerfile b/Dockerfile index 0b7eacb..06ebb7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \ ./install.sh # Download default voice -COPY voices/ /root/.local/share/mimic3/voices/ +COPY voices/ /root/.local/share/mycroft-mimic3-tts/voices/ RUN .venv/bin/mimic3-download 'en_UK/apope_low' # ----------------------------------------------------------------------------- @@ -90,7 +90,7 @@ RUN useradd -ms /bin/bash mimic3 COPY --from=build /home/mimic3/app/ ./ # Copy pre-downloaded voice(s) -COPY --from=build /root/.local/share/mimic3/voices/ /usr/share/mimic3/voices/ +COPY --from=build /root/.local/share/mycroft-mimic3-tts/voices/ /usr/share/mycroft-mimic3-tts/voices/ # Run test COPY tests/* ./tests/ diff --git a/Dockerfile.debian b/Dockerfile.debian index 45101a7..6678436 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -114,7 +114,7 @@ COPY pyinstaller/mimic3-server \ dist/mimic3/ # Create Debian package -ENV package_dir=/package/mimic3-tts +ENV package_dir=/package/mycroft-mimic3-tts COPY debian/ debian/ COPY voices/ voices/ @@ -124,15 +124,15 @@ RUN mkdir -p "${package_dir}/DEBIAN" && \ envsubst \ < "debian/control.in.${TARGETARCH}${TARGETVARIANT}" \ > "${package_dir}/DEBIAN/control" && \ - mkdir -p "${package_dir}/usr/lib/mimic3-tts" && \ - rsync -av "dist/mimic3/" "${package_dir}/usr/lib/mimic3-tts/" && \ + mkdir -p "${package_dir}/usr/lib/mycroft-mimic3-tts" && \ + rsync -av "dist/mimic3/" "${package_dir}/usr/lib/mycroft-mimic3-tts/" && \ mkdir -p "${package_dir}/usr/bin/" && \ rsync -av "debian/bin/" "${package_dir}/usr/bin/" && \ - export dest_voice_dir="${package_dir}/usr/share/mimic3/voices/en_UK/apope_low" && \ + export dest_voice_dir="${package_dir}/usr/share/mycroft-mimic3-tts/voices/en_UK/apope_low" && \ mkdir -p "${dest_voice_dir}" && \ rsync -av "voices/en_UK/apope_low/" "${dest_voice_dir}/" && \ cd /package && \ - dpkg --build 'mimic3-tts' && \ + dpkg --build 'mycroft-mimic3-tts' && \ dpkg-name ./*.deb # ----------------------------------------------------------------------------- @@ -163,7 +163,7 @@ RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \ dpkg-architecture | \ grep 'DEB_HOST_ARCH=' | \ sed -e 's/.\+=//' | \ - xargs printf "./mimic3-tts_${mimic3_version}_%s.deb" | \ + xargs printf "./mycroft-mimic3-tts_${mimic3_version}_%s.deb" | \ xargs apt install --yes # Run test diff --git a/Dockerfile.dist b/Dockerfile.dist index a99f0b7..d5306c9 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -88,7 +88,7 @@ RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \ mycroft-mimic3-tts # Download default voice -COPY voices/ /root/.local/share/mimic3/voices/ +COPY voices/ /root/.local/share/mycroft-mimic3-tts/voices/ RUN .venv/bin/mimic3-download 'en_UK/apope_low' # Run test diff --git a/Dockerfile.plugin b/Dockerfile.plugin index ce4c1c5..e2b2727 100644 --- a/Dockerfile.plugin +++ b/Dockerfile.plugin @@ -101,7 +101,7 @@ RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \ mycroft-plugin-tts-mimic3 # Download default voice -COPY voices/ /root/.local/share/mimic3/voices/ +COPY voices/ /root/.local/share/mycroft-mimic3-tts/voices/ RUN mycroft-core/.venv/bin/mimic3-download 'en_UK/apope_low' # Enable plugin diff --git a/Dockerfile.sample b/Dockerfile.sample index 1e5a6fc..4e3e2bb 100644 --- a/Dockerfile.sample +++ b/Dockerfile.sample @@ -55,7 +55,7 @@ RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \ ./install.sh # Download default voice -COPY voices/ /root/.local/share/mimic3/voices/ +COPY voices/ /root/.local/share/mycroft-mimic3-tts/voices/ RUN .venv/bin/mimic3-download 'en_UK/apope_low' # Generate sample diff --git a/Jenkinsfile b/Jenkinsfile index 0c5c48a..9939368 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ // Jenkins pipeline for building Mimic 3 artifacts. // // Requires Docker buildx: https://docs.docker.com/buildx/working-with-buildx/ -// Assumes the en_UK/apope_low voice is in /home/jenkins/.local/share/mimic3/voices +// Assumes the en_UK/apope_low voice is in /home/jenkins/.local/share/mycroft-mimic3-tts/voices pipeline { agent any @@ -27,7 +27,7 @@ pipeline { DOCKER_BUILDKIT = '1' DOCKER_PLATFORM = 'linux/amd64,linux/arm64,linux/arm/v7' DEFAULT_VOICE = 'en_UK/apope_low' - DEFAULT_VOICE_PATH = '/home/jenkins/.local/share/mimic3/voices' + DEFAULT_VOICE_PATH = '/home/jenkins/.local/share/mycroft-mimic3-tts/voices' } stages { diff --git a/README.md b/README.md index 9e9fd2b..d1b8fd9 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ docker run \ 'mycroftai/mimic3' ``` -Voices will be automatically downloaded to `${HOME}/.local/share/mimic3/voices` +Voices will be automatically downloaded to `${HOME}/.local/share/mycroft-mimic3-tts/voices` ### Debian Package diff --git a/debian/control.in.amd64 b/debian/control.in.amd64 index d1bdacb..ab87bbb 100644 --- a/debian/control.in.amd64 +++ b/debian/control.in.amd64 @@ -1,4 +1,4 @@ -Package: mimic3-tts +Package: mycroft-mimic3-tts Version: ${VERSION} Section: utils Priority: optional diff --git a/debian/control.in.arm64 b/debian/control.in.arm64 index bdfa955..57fbd18 100644 --- a/debian/control.in.arm64 +++ b/debian/control.in.arm64 @@ -1,4 +1,4 @@ -Package: mimic3-tts +Package: mycroft-mimic3-tts Version: ${VERSION} Section: utils Priority: optional diff --git a/debian/control.in.armv7 b/debian/control.in.armv7 index 88ff411..75e19d0 100644 --- a/debian/control.in.armv7 +++ b/debian/control.in.armv7 @@ -1,4 +1,4 @@ -Package: mimic3-tts +Package: mycroft-mimic3-tts Version: ${VERSION} Section: utils Priority: optional diff --git a/mimic3_tts/tts.py b/mimic3_tts/tts.py index 2f50c2a..ced5348 100644 --- a/mimic3_tts/tts.py +++ b/mimic3_tts/tts.py @@ -160,11 +160,14 @@ class Mimic3TextToSpeechSystem(TextToSpeechSystem): """Get list of directories to search for voices by default. On Linux, this is typically: - - $HOME/.local/share/mimic3/voices - - /usr/local/share/mimic3/voices - - /usr/share/mimic3/voices + - $HOME/.local/share/mycroft-mimic3-tts/voices + - /usr/local/share/mycroft-mimic3-tts/voices + - /usr/share/mycroft-mimic3-tts/voices """ - return [Path(d) / "mimic3" / "voices" for d in XDG().XDG_DATA_DIRS.split(":")] + return [ + Path(d) / "mycroft-mimic3-tts" / "voices" + for d in XDG().XDG_DATA_DIRS.split(":") + ] def get_voices(self) -> typing.Iterable[Voice]: """Returns an iterable of all available voices"""