update

melo/download_utils.py

@@ -1,6 +1,9 @@
 import torch
 import os
 from . import utils
+current_dir = os.getcwd()
+_config_path = os.path.join(current_dir, 'openvoice/basespeakers/{language}/config.json')
+_ckpt_path = os.path.join(current_dir, 'openvoice/basespeakers/{language}/checkpoint.pth')
 
 DOWNLOAD_CKPT_URLS = {
     'EN': 'https://myshell-public-repo-hosting.s3.amazonaws.com/openvoice/basespeakers/EN/checkpoint.pth',
@@ -25,23 +28,28 @@ DOWNLOAD_CONFIG_URLS = {
 def load_or_download_config(locale):
     language = locale.split('-')[0].upper()
     assert language in DOWNLOAD_CONFIG_URLS
-    config_path = os.path.expanduser(f'~/.local/share/openvoice/basespeakers/{language}/config.json')
+
+    #config_path = os.path.expanduser(f'~/.local/share/openvoice/basespeakers/{language}/config.json')
+    config_path = os.path.expanduser(_config_path)
     try:
         return utils.get_hparams_from_file(config_path)
     except:
         # download
         os.makedirs(os.path.dirname(config_path), exist_ok=True)
-        os.system(f'wget {DOWNLOAD_CONFIG_URLS[language]} -O {config_path}')
+        #os.system(f'wget {DOWNLOAD_CONFIG_URLS[language]} -O {config_path}')
+        os.system(f'curl -L {DOWNLOAD_CONFIG_URLS[language]} -O {config_path}')
     return utils.get_hparams_from_file(config_path)
 
 def load_or_download_model(locale, device):
     language = locale.split('-')[0].upper()
     assert language in DOWNLOAD_CKPT_URLS
-    ckpt_path = os.path.expanduser(f'~/.local/share/openvoice/basespeakers/{language}/checkpoint.pth')
+    #ckpt_path = os.path.expanduser(f'~/.local/share/openvoice/basespeakers/{language}/checkpoint.pth')
+    ckpt_path = os.path.expanduser(_ckpt_path)
     try:
         return torch.load(ckpt_path, map_location=device)
     except:
         # download
         os.makedirs(os.path.dirname(ckpt_path), exist_ok=True)
-        os.system(f'wget {DOWNLOAD_CKPT_URLS[language]} -O {ckpt_path}')
-    return torch.load(ckpt_path, map_location=device)
+        #os.system(f'wget {DOWNLOAD_CKPT_URLS[language]} -O {ckpt_path}')
+        os.system(f'curl -L {DOWNLOAD_CKPT_URLS[language]} -O {ckpt_path}')
+    return torch.load(ckpt_path, map_location=device)