Use pyphen's list of languages as choice

Japan7 · Jan 14, 2024 · 4392daa · 4392daa
1 parent 96626ce
commit 4392daa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/yohane/__main__.py b/yohane/__main__.py
@@ -5,6 +5,7 @@
 
 import click
 import torchaudio
+from pyphen import LANGUAGES_LOWERCASE
 
 from yohane.audio import (
     HybridDemucsVocalsExtractor,
@@ -49,7 +50,7 @@
 @click.option(
     "-l",
     "--language",
-    type=click.STRING,
+    type=click.Choice(list(LANGUAGES_LOWERCASE.keys()) + ["jp"], case_sensitive=False),
     default="jp",
     help="Language of the lyrics in ISO 639-1 norm. Default is Japanese (jp)."
 )

diff --git a/yohane/lyrics.py b/yohane/lyrics.py
@@ -39,12 +39,7 @@ def syllables(self):
         if self.language == 'jp':
             res = auto_split(res)
         else:
-            if self.language == 'en':
-                dic = pyphen.Pyphen(lang="en_EN")
-            elif self.language == 'fr':
-                dic = pyphen.Pyphen(lang="fr_FR")
-            else:
-                raise ValueError(f"Unsupported language {self.language}")
+            dic = pyphen.Pyphen(lang=self.language)
             res = dic.inserted(res)
             res = res.split("-")
         return res