Update rvc/lib/tools/model_download.py

rvc/lib/tools/model_download.py

@@ -280,85 +280,89 @@ def unzip_file(zip_path, zip_file_name):
 
 
 def model_download_pipeline(url):
-    verify = download_from_url(url)
-    if verify == "downloaded":
-        extract_folder_path = ""
-        for filename in os.listdir(zips_path):
-            if filename.endswith(".zip"):
-                zipfile_path = os.path.join(zips_path, filename)
-                print("Proceeding with the extraction...")
-
-                model_zip = os.path.basename(zipfile_path)
-                model_name = format_title(model_zip.split(".zip")[0])
-                extract_folder_path = os.path.join(
-                    "logs",
-                    os.path.normpath(model_name),
-                )
-
-                success = extract_and_show_progress(zipfile_path, extract_folder_path)
-
-                subfolders = [
-                    f
-                    for f in os.listdir(extract_folder_path)
-                    if os.path.isdir(os.path.join(extract_folder_path, f))
-                ]
-                if len(subfolders) == 1:
-                    subfolder_path = os.path.join(extract_folder_path, subfolders[0])
-                    for item in os.listdir(subfolder_path):
-                        s = os.path.join(subfolder_path, item)
-                        d = os.path.join(extract_folder_path, item)
-                        shutil.move(s, d)
-                    os.rmdir(subfolder_path)
-
-                for item in os.listdir(extract_folder_path):
-                    if ".pth" in item:
-                        file_name = item.split(".pth")[0]
-                        if file_name != model_name:
-                            os.rename(
-                                os.path.join(extract_folder_path, item),
-                                os.path.join(extract_folder_path, model_name + ".pth"),
-                            )
-                    else:
-                        if "v2" not in item:
-                            file_name = item.split("_nprobe_1_")[1].split("_v1")[0]
+    try:
+        verify = download_from_url(url)
+        if verify == "downloaded":
+            extract_folder_path = ""
+            for filename in os.listdir(zips_path):
+                if filename.endswith(".zip"):
+                    zipfile_path = os.path.join(zips_path, filename)
+                    print("Proceeding with the extraction...")
+    
+                    model_zip = os.path.basename(zipfile_path)
+                    model_name = format_title(model_zip.split(".zip")[0])
+                    extract_folder_path = os.path.join(
+                        "logs",
+                        os.path.normpath(model_name),
+                    )
+    
+                    success = extract_and_show_progress(zipfile_path, extract_folder_path)
+    
+                    subfolders = [
+                        f
+                        for f in os.listdir(extract_folder_path)
+                        if os.path.isdir(os.path.join(extract_folder_path, f))
+                    ]
+                    if len(subfolders) == 1:
+                        subfolder_path = os.path.join(extract_folder_path, subfolders[0])
+                        for item in os.listdir(subfolder_path):
+                            s = os.path.join(subfolder_path, item)
+                            d = os.path.join(extract_folder_path, item)
+                            shutil.move(s, d)
+                        os.rmdir(subfolder_path)
+    
+                    for item in os.listdir(extract_folder_path):
+                        if ".pth" in item:
+                            file_name = item.split(".pth")[0]
                             if file_name != model_name:
-                                new_file_name = (
-                                    item.split("_nprobe_1_")[0]
-                                    + "_nprobe_1_"
-                                    + model_name
-                                    + "_v1"
-                                )
                                 os.rename(
                                     os.path.join(extract_folder_path, item),
-                                    os.path.join(
-                                        extract_folder_path, new_file_name + ".index"
-                                    ),
+                                    os.path.join(extract_folder_path, model_name + ".pth"),
                                 )
                         else:
-                            file_name = item.split("_nprobe_1_")[1].split("_v2")[0]
-                            if file_name != model_name:
-                                new_file_name = (
-                                    item.split("_nprobe_1_")[0]
-                                    + "_nprobe_1_"
-                                    + model_name
-                                    + "_v2"
-                                )
-                                os.rename(
-                                    os.path.join(extract_folder_path, item),
-                                    os.path.join(
-                                        extract_folder_path, new_file_name + ".index"
-                                    ),
-                                )
-
-                if success:
-                    print(f"Model {model_name} downloaded!")
-                else:
-                    print(f"Error downloading {model_name}")
-                    sys.exit()
-        if extract_folder_path == "":
-            print("Zip file was not found.")
+                            if "v2" not in item:
+                                file_name = item.split("_nprobe_1_")[1].split("_v1")[0]
+                                if file_name != model_name:
+                                    new_file_name = (
+                                        item.split("_nprobe_1_")[0]
+                                        + "_nprobe_1_"
+                                        + model_name
+                                        + "_v1"
+                                    )
+                                    os.rename(
+                                        os.path.join(extract_folder_path, item),
+                                        os.path.join(
+                                            extract_folder_path, new_file_name + ".index"
+                                        ),
+                                    )
+                            else:
+                                file_name = item.split("_nprobe_1_")[1].split("_v2")[0]
+                                if file_name != model_name:
+                                    new_file_name = (
+                                        item.split("_nprobe_1_")[0]
+                                        + "_nprobe_1_"
+                                        + model_name
+                                        + "_v2"
+                                    )
+                                    os.rename(
+                                        os.path.join(extract_folder_path, item),
+                                        os.path.join(
+                                            extract_folder_path, new_file_name + ".index"
+                                        ),
+                                    )
+    
+                    if success:
+                        print(f"Model {model_name} downloaded!")
+                    else:
+                        print(f"Error downloading {model_name}")
+                        sys.exit()
+            if extract_folder_path == "":
+                print("Zip file was not found.")
+                sys.exit()
+            result = search_pth_index(extract_folder_path)
+        else:
+            message = "Error"
             sys.exit()
-        result = search_pth_index(extract_folder_path)
-    else:
-        message = "Error"
-        sys.exit()
+    except Exception as error:
+        print(f"Error: {error}")
+