ychwanegu benyw-gogledd

techiaith · Mar 12, 2021 · 2e71549 · 2e71549
1 parent 81ad56a
commit 2e71549
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,8 @@ WORKDIR ${MARYTTS_HOME}
 
 RUN update-marytts-server-cy.sh
 
-RUN voice-download.sh wispr
+RUN voice-download.sh wispr \
+ && voice-download.sh benyw-gogledd
 
 EXPOSE 59125
 
diff --git a/server/Makefile b/server/Makefile
@@ -9,8 +9,7 @@ build:
  cp installed-voices.txt ${VOICES_DIR}/; \
  fi
  docker build --rm -t techiaith/marytts-server:${MARYTTS_CY_VERSION} \
- --build-arg MARYTTS_CY_VERSION=${MARYTTS_CY_VERSION} \
- .
+ --build-arg MARYTTS_CY_VERSION=${MARYTTS_CY_VERSION} .
 
 
 run:

diff --git a/server/cherrypy/wsgi.py b/server/cherrypy/wsgi.py
@@ -177,9 +177,10 @@ def speak(self, text, uid='wispr', lang='cy', format='mp3', **kwargs):
  raise ValueError("'lang' must be either 'cy' or 'en_US'")
  except ValueError as e:
  return "ERROR: %s" % str(e)
-
- is_wispr = (uid.lower() == 'wispr')
- if is_wispr:
+
+ cherrypy.log(str(self.installed_voices))
+ is_voice = uid.lower() in self.installed_voices
+ if is_voice:
  voice = uid
  else:
  voice = uid + "_" + lang 

diff --git a/server/installed-voices.txt b/server/installed-voices.txt
@@ -1 +1,2 @@
-wispr
+wispr
+benyw-gogledd