GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

handle spaces in voices, add platform prefix

Browse source
This commit is contained in:
Damien Elmes 2020-01-22 17:36:38 +10:00
parent 3f3a8fc4ab
commit 95b497ccf0
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qt/aqt/tts.py
View file

@ -109,6 +109,11 @@ class TTSProcessPlayer(SimpleProcessPlayer, TTSPlayer):
########################################################################## ##########################################################################
@dataclass
class MacVoice(TTSVoice):
original_name: str
class MacTTSPlayer(TTSProcessPlayer): class MacTTSPlayer(TTSProcessPlayer):
"Invokes a process to play the audio in the background." "Invokes a process to play the audio in the background."
@ -119,9 +124,10 @@ class MacTTSPlayer(TTSProcessPlayer):
match = self.voice_for_tag(tag) match = self.voice_for_tag(tag)
assert match assert match
voice = match.voice voice = match.voice
assert isinstance(voice, MacVoice)
self._process = subprocess.Popen( self._process = subprocess.Popen(
["say", "-v", voice.name, "-f", "-"], ["say", "-v", voice.original_name, "-f", "-"],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
@ -147,7 +153,10 @@ class MacTTSPlayer(TTSProcessPlayer):
m = self.VOICE_HELP_LINE_RE.match(line) m = self.VOICE_HELP_LINE_RE.match(line)
if not m: if not m:
return None return None
return TTSVoice(name=m.group(1).strip(), lang=m.group(2))
original_name = m.group(1).strip()
tidy_name = "Apple_" + original_name.replace(" ", "_")
return MacVoice(name=tidy_name, original_name=original_name, lang=m.group(2))
class MacTTSFilePlayer(MacTTSPlayer): class MacTTSFilePlayer(MacTTSPlayer):
@ -160,9 +169,10 @@ class MacTTSFilePlayer(MacTTSPlayer):
match = self.voice_for_tag(tag) match = self.voice_for_tag(tag)
assert match assert match
voice = match.voice voice = match.voice
assert isinstance(voice, MacVoice)
self._process = subprocess.Popen( self._process = subprocess.Popen(
["say", "-v", voice.name, "-f", "-", "-o", self.tmppath], ["say", "-v", voice.original_name, "-f", "-", "-o", self.tmppath],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
@ -419,9 +429,8 @@ if isWin:
def _voice_to_object(self, voice: Any): def _voice_to_object(self, voice: Any):
lang = voice.GetAttribute("language") lang = voice.GetAttribute("language")
lang = lcid_hex_str_to_lang_code(lang) lang = lcid_hex_str_to_lang_code(lang)
return WindowsVoice( name = self._tidy_name(voice.GetAttribute("name"))
name=voice.GetAttribute("name"), lang=lang, handle=voice return WindowsVoice(name=name, lang=lang, handle=voice)
)
def _play(self, tag: AVTag) -> None: def _play(self, tag: AVTag) -> None:
assert isinstance(tag, TTSTag) assert isinstance(tag, TTSTag)
@ -443,3 +452,9 @@ if isWin:
return return
finally: finally:
self._terminate_flag = False self._terminate_flag = False
def _tidy_name(self, name: str) -> str:
"eg. Microsoft Haruka Desktop -> MS-Haruka."
return re.sub(r"^Microsoft (.+) Desktop$", "Microsoft_\\1", name).replace(
" ", "_"
)