Clean Path (RVC-Boss#1299)

* clean path

* clean path

Author: XXXXRT666

tools/my_utils.py

@@ -25,7 +25,9 @@ def load_audio(file, sr):
     return np.frombuffer(out, np.float32).flatten()
 
 
-def clean_path(path_str):
+def clean_path(path_str:str):
+    if path_str.endswith(('\\','/')):
+        return clean_path(path_str[0:-1])
     if platform.system() == 'Windows':
         path_str = path_str.replace('/', '\\')
-    return path_str.strip(" ").strip('"').strip("\n").strip('"').strip(" ").strip("\u202a")
+    return path_str.strip(" ").strip('"').strip("\n").strip('"').strip(" ").strip("\u202a")

tools/uvr5/webui.py

@@ -2,6 +2,7 @@
 import traceback,gradio as gr
 import logging
 from tools.i18n.i18n import I18nAuto
+from tools.my_utils import clean_path
 i18n = I18nAuto()
 
 logger = logging.getLogger(__name__)
@@ -26,13 +27,9 @@
 def uvr(model_name, inp_root, save_root_vocal, paths, save_root_ins, agg, format0):
     infos = []
     try:
-        inp_root = inp_root.strip(" ").strip('"').strip("\n").strip('"').strip(" ")
-        save_root_vocal = (
-            save_root_vocal.strip(" ").strip('"').strip("\n").strip('"').strip(" ")
-        )
-        save_root_ins = (
-            save_root_ins.strip(" ").strip('"').strip("\n").strip('"').strip(" ")
-        )
+        inp_root = clean_path(inp_root)
+        save_root_vocal = clean_path(save_root_vocal)
+        save_root_ins = clean_path(save_root_ins)
         is_hp3 = "HP3" in model_name
         if model_name == "onnx_dereverb_By_FoxJoy":
             pre_fun = MDXNetDereverb(15)

webui.py

@@ -199,6 +199,7 @@ def open_asr(asr_inp_dir, asr_opt_dir, asr_model, asr_model_size, asr_lang):
     global p_asr
     if(p_asr==None):
         asr_inp_dir=my_utils.clean_path(asr_inp_dir)
+        asr_opt_dir=my_utils.clean_path(asr_opt_dir)
         cmd = f'"{python_exec}" tools/asr/{asr_dict[asr_model]["path"]}'
         cmd += f' -i "{asr_inp_dir}"'
         cmd += f' -o "{asr_opt_dir}"'