blackteay/GPT-SoVITS
1
0
Fork 0
mirror of https://github.com/RVC-Boss/GPT-SoVITS.git synced 2025-04-06 03:57:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid path (#2114)

Browse Source 
* Fix korean invalid path

* Fix japanese invalid path

* Fix langsegmenter invalid path
This commit is contained in:
KamioRinn 2025-02-26 23:37:19 +08:00 committed by GitHub
parent 8158a97909
commit 237526a7e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GPT_SoVITS/text/LangSegmenter/langsegmenter.py
View File

@ -50,7 +50,7 @@ def load_fasttext_model(
model = fast_langdetect.ft_detect.infer.fasttext.load_model(str(model_path)) model = fast_langdetect.ft_detect.infer.fasttext.load_model(str(model_path))
else: else:
python_dir = os.getcwd() python_dir = os.getcwd()
if (str(model_path)[:len(python_dir)] == python_dir): if (str(model_path)[:len(python_dir)].upper() == python_dir.upper()):
model = fast_langdetect.ft_detect.infer.fasttext.load_model(os.path.relpath(model_path, python_dir)) model = fast_langdetect.ft_detect.infer.fasttext.load_model(os.path.relpath(model_path, python_dir))
else: else:
import tempfile import tempfile

34
GPT_SoVITS/text/japanese.py
View File

@ -5,6 +5,40 @@ import hashlib
try: try:
import pyopenjtalk import pyopenjtalk
current_file_path = os.path.dirname(__file__) current_file_path = os.path.dirname(__file__)
# 防止win下无法读取模型
if os.name == 'nt':
python_dir = os.getcwd()
OPEN_JTALK_DICT_DIR = pyopenjtalk.OPEN_JTALK_DICT_DIR.decode("utf-8")
if not (re.match(r'^[A-Za-z0-9_/\\:.]*$', OPEN_JTALK_DICT_DIR)):
if (OPEN_JTALK_DICT_DIR[:len(python_dir)].upper() == python_dir.upper()):
OPEN_JTALK_DICT_DIR = os.path.join(os.path.relpath(OPEN_JTALK_DICT_DIR,python_dir))
else:
import shutil
if not os.path.exists('TEMP'):
os.mkdir('TEMP')
if not os.path.exists(os.path.join("TEMP", "ja")):
os.mkdir(os.path.join("TEMP", "ja"))
if os.path.exists(os.path.join("TEMP", "ja", "open_jtalk_dic")):
shutil.rmtree(os.path.join("TEMP", "ja", "open_jtalk_dic"))
shutil.copytree(pyopenjtalk.OPEN_JTALK_DICT_DIR.decode("utf-8"), os.path.join("TEMP", "ja", "open_jtalk_dic"), )
OPEN_JTALK_DICT_DIR = os.path.join("TEMP", "ja", "open_jtalk_dic")
pyopenjtalk.OPEN_JTALK_DICT_DIR = OPEN_JTALK_DICT_DIR.encode("utf-8")
if not (re.match(r'^[A-Za-z0-9_/\\:.]*$', current_file_path)):
if (current_file_path[:len(python_dir)].upper() == python_dir.upper()):
current_file_path = os.path.join(os.path.relpath(current_file_path,python_dir))
else:
if not os.path.exists('TEMP'):
os.mkdir('TEMP')
if not os.path.exists(os.path.join("TEMP", "ja")):
os.mkdir(os.path.join("TEMP", "ja"))
if not os.path.exists(os.path.join("TEMP", "ja", "ja_userdic")):
os.mkdir(os.path.join("TEMP", "ja", "ja_userdic"))
shutil.copyfile(os.path.join(current_file_path, "ja_userdic", "userdict.csv"),os.path.join("TEMP", "ja", "ja_userdic", "userdict.csv"))
current_file_path = os.path.join("TEMP", "ja")
def get_hash(fp: str) -> str: def get_hash(fp: str) -> str:
hash_md5 = hashlib.md5() hash_md5 = hashlib.md5()
with open(fp, "rb") as f: with open(fp, "rb") as f:

14
GPT_SoVITS/text/korean.py
View File

@ -28,14 +28,18 @@ if os.name == 'nt':
if not (re.match(r'^[A-Za-z0-9_/\\:.]*$', installpath)): if not (re.match(r'^[A-Za-z0-9_/\\:.]*$', installpath)):
import shutil import shutil
python_dir = os.getcwd() python_dir = os.getcwd()
if (installpath[:len(python_dir)] == python_dir): if (installpath[:len(python_dir)].upper() == python_dir.upper()):
dicpath = os.path.join(os.path.relpath(installpath,python_dir),'data','mecabrc') dicpath = os.path.join(os.path.relpath(installpath,python_dir),'data','mecabrc')
else: else:
if os.path.exists(os.path.join('komecabdata')): if not os.path.exists('TEMP'):
shutil.rmtree(os.path.join('komecabdata')) os.mkdir('TEMP')
if not os.path.exists(os.path.join('TEMP', 'ko')):
os.mkdir(os.path.join('TEMP', 'ko'))
if os.path.exists(os.path.join('TEMP', 'ko', 'ko_dict')):
shutil.rmtree(os.path.join('TEMP', 'ko', 'ko_dict'))
shutil.copytree(os.path.join(installpath, 'data'), 'komecabdata') shutil.copytree(os.path.join(installpath, 'data'), os.path.join('TEMP', 'ko', 'ko_dict'))
dicpath = os.path.join('komecabdata', 'mecabrc') dicpath = os.path.join('TEMP', 'ko', 'ko_dict', 'mecabrc')
else: else:
dicpath=os.path.abspath(os.path.join(installpath, 'data/mecabrc')) dicpath=os.path.abspath(os.path.join(installpath, 'data/mecabrc'))
return dicpath return dicpath