diff --git a/FoxDot/lib/Extensions/VRender/Sinsy.py b/FoxDot/lib/Extensions/VRender/Sinsy.py index c7b676b3..04e70848 100644 --- a/FoxDot/lib/Extensions/VRender/Sinsy.py +++ b/FoxDot/lib/Extensions/VRender/Sinsy.py @@ -1,5 +1,5 @@ import sys -import urllib +import urllib.request from functools import reduce @@ -8,5 +8,4 @@ def download(output,wavPath): index = text.find('./temp/') + len('./temp/') text = text[index:index+40].split(".")[0] - testfile = urllib.URLopener() - testfile.retrieve("http://sinsy.sp.nitech.ac.jp/temp/" + text + ".wav", wavPath) \ No newline at end of file + urllib.request.urlretrieve("http://sinsy.sp.nitech.ac.jp/temp/" + text + ".wav", wavPath) diff --git a/FoxDot/lib/Extensions/VRender/VRender.py b/FoxDot/lib/Extensions/VRender/VRender.py index 548a5b6e..a3b65196 100644 --- a/FoxDot/lib/Extensions/VRender/VRender.py +++ b/FoxDot/lib/Extensions/VRender/VRender.py @@ -39,8 +39,8 @@ def renderizeVoice(outputName,lyrics,notes,durations,tempo,scale,sex,foxdot_root print("Finished voice renderization") def tokenize(text): - textSyllables = cleanText(text) - return filter(lambda x: len(x) > 0, textSyllables.replace(" ", "-").split("-")) + textSyllables = cleanText(text).replace(" ", "-").split("-") + return {i: v for i, v in enumerate([s for s in textSyllables if s])} def cleanText(text): @@ -51,4 +51,4 @@ def cleanText(text): for symbol in symbolsToDelete: text = text.replace(symbol,"") - return text \ No newline at end of file + return text