diff --git a/jarvis-config-default.sh b/jarvis-config-default.sh index c46d2c3..4f16858 100644 --- a/jarvis-config-default.sh +++ b/jarvis-config-default.sh @@ -28,5 +28,5 @@ trigger_mode="magic_word" trigger_stt="snowboy" tts_engine="svox_pico" username="`whoami`" -voxygen_voice="Loic" +#voxygen_voice="Loic" wit_server_access_token="" diff --git a/jarvis.sh b/jarvis.sh index 0dd3225..c4a847c 100755 --- a/jarvis.sh +++ b/jarvis.sh @@ -135,7 +135,7 @@ configure () { 'trigger_mode' 'tts_engine' 'username' - 'voxygen_voice' + #'voxygen_voice' 'wit_server_access_token') local hooks=( 'entering_cmd' 'exiting_cmd' @@ -194,6 +194,11 @@ configure () { not_installed=0 fi done + if [ "$tts_engine" == "voxygen" ]; then + jv_error "Voxygen speech engine has been removed as no longer supported" + jv_debug "See https://github.com/alexylem/jarvis/issues/446" + jv_warning "Change your speech engine in Settings > Speech synthesis" + fi return $not_installed;; max_noise_duration_to_kill) eval "$1=\"$(dialog_input "Max noise duration to kill" "${!1}")\"";; min_noise_duration_to_start) eval "$1=\"$(dialog_input "Min noise duration to start" "${!1}")\"";; @@ -268,28 +273,28 @@ configure () { eval "$1=\"$(dialog_select "Which engine to use for the recognition of the hotword ($trigger)\nVisit http://domotiquefacile.fr/jarvis/content/stt\nRecommended: snowboy" options[@] "${!1}")\"" source stt_engines/$trigger_stt/main.sh ;; - tts_engine) options=('svox_pico' 'google' 'espeak' 'osx_say' 'voxygen') + tts_engine) options=('svox_pico' 'google' 'espeak' 'osx_say') # 'voxygen' recommended="$([ "$platform" = "osx" ] && echo 'osx_say' || echo 'svox_pico')" eval "$1=\"$(dialog_select "Which engine to use for the speech synthesis\nVisit http://domotiquefacile.fr/jarvis/content/tts\nRecommended for your platform: $recommended" options[@] "${!1}")\"" source tts_engines/$tts_engine/main.sh rm -f "$jv_cache_folder"/*.mp3 # remove cached voice case "$tts_engine" in osx_say) configure "osx_say_voice";; - voxygen) configure "voxygen_voice";; + #voxygen) configure "voxygen_voice";; esac ;; username) eval "$1=\"$(dialog_input "How would you like to be called?" "${!1}" true)\"";; - voxygen_voice) case "$language" in - de_DE) options=('Matthias');; - es_ES) options=('Martha');; - fr_FR) options=('Loic' 'Philippe' 'Marion' 'Electra' 'Becool');; - it_IT) options=('Sonia');; - en_GB) options=('Bruce' 'Jenny');; - *) options=();; - esac - eval "$1=\"$(dialog_select "Voxygen $language Voices\nVisit https://www.voxygen.fr to test them" options[@] "${!1}")\"" - rm -f "$jv_cache_folder"/*.mp3 # remove cached voice - ;; +# voxygen_voice) case "$language" in +# de_DE) options=('Matthias');; +# es_ES) options=('Martha');; +# fr_FR) options=('Loic' 'Philippe' 'Marion' 'Electra' 'Becool');; +# it_IT) options=('Sonia');; +# en_GB) options=('Bruce' 'Jenny');; +# *) options=();; +# esac +# eval "$1=\"$(dialog_select "Voxygen $language Voices\nVisit https://www.voxygen.fr to test them" options[@] "${!1}")\"" +# rm -f "$jv_cache_folder"/*.mp3 # remove cached voice +# ;; wit_server_access_token) eval "$1=\"$(dialog_input "Wit Server Access Token\nHow to get one: https://wit.ai/apps/new" "${!1}" true)\"";; *) jv_error "ERROR: Unknown configure $1";; esac @@ -418,8 +423,8 @@ while getopts ":$flags" o; do case "${o}" in b) # Check if Jarvis is already running in background if jv_is_started; then - echo "Jarvis is already running" - echo "run ./jarvis.sh -q to stop it" + jv_error "Jarvis is already running" + jv_warning "run ./jarvis.sh -q to stop it" exit 1 fi jv_start_in_background diff --git a/test/core-test.sh b/test/core-test.sh index c71b8f8..7a8bf9d 100644 --- a/test/core-test.sh +++ b/test/core-test.sh @@ -7,7 +7,7 @@ it_shows_help() { } it_checks_root () { - test "$(sudo ./jarvis.sh -w)" = "ERROR: Jarvis must not be used as root" + test "$(sudo ./jarvis.sh -w 2>&1)" = "ERROR: Jarvis must not be used as root" } it_says_hello() { diff --git a/tts_engines/voxygen_old/README.md b/tts_engines/voxygen_old/README.md new file mode 100644 index 0000000..dda8688 --- /dev/null +++ b/tts_engines/voxygen_old/README.md @@ -0,0 +1,11 @@ +# Important + +Voxygen secured their web demo page and it's no longer possible to use this page as an online speech synthesis engine service. +I have therefore decided to remove Voxygen from the list of speech synthesis engines. +As a remplacement, you can use the 100% offline solution: svox_pico +Thanks for your understanding + +Voxygen a sécurisé sa démo web et il n'est plus possible d'utiliser cette page en tant que service de synthèse vocal en ligne. +J'ai donc décidé de retirer Voxygen de la liste des moteurs de syntèse vocal. +En remplacement, vous pouvez utiliser la solution 100% hors ligne: svox_pico +Merci de votre compréhension diff --git a/tts_engines/voxygen/main.sh b/tts_engines/voxygen_old/main.sh similarity index 100% rename from tts_engines/voxygen/main.sh rename to tts_engines/voxygen_old/main.sh diff --git a/utils/menu.sh b/utils/menu.sh index 9f7603f..d4423e6 100644 --- a/utils/menu.sh +++ b/utils/menu.sh @@ -365,10 +365,10 @@ EOM done;; "Speech synthesis") while true; do - options=("Speech engine ($tts_engine)" "Voxygen voice ($voxygen_voice)" "OSX voice ($osx_say_voice)" "Cache folder ($tmp_folder)") + options=("Speech engine ($tts_engine)" "OSX voice ($osx_say_voice)" "Cache folder ($tmp_folder)") #"Voxygen voice ($voxygen_voice)" case "`dialog_menu 'Configuration > Speech synthesis' options[@]`" in Speech*engine*) configure "tts_engine";; - Voxygen*voice*) configure "voxygen_voice";; + #Voxygen*voice*) configure "voxygen_voice";; OSX*voice*) configure "osx_say_voice";; Cache*folder*) configure "tmp_folder";; *) break;; diff --git a/utils/utils.sh b/utils/utils.sh index 653e7ee..ada0514 100644 --- a/utils/utils.sh +++ b/utils/utils.sh @@ -229,7 +229,7 @@ jv_message() { } # Public: Displays a error in red # $1 - message to display -jv_error() { jv_message "$1" "error" "$_red" ;} +jv_error() { jv_message "$1" "error" "$_red" 1>&2 ;} # Public: Displays a warning in yellow # $1 - message to display jv_warning() { jv_message "$1" "warning" "$_orange" ;} diff --git a/version.txt b/version.txt index cd130fb..a61ffbe 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -17.02.28 +17.03.02