From 0a3a1e4505c490a95accc268e7de2897026b8eaa Mon Sep 17 00:00:00 2001
From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com>
Date: Sat, 13 Jul 2024 19:17:46 +0800
Subject: [PATCH] Clean Path (#1299)

* clean path

* clean path
---
 tools/my_utils.py   |  6 ++++--
 tools/uvr5/webui.py | 11 ++++-------
 webui.py            |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/my_utils.py b/tools/my_utils.py
index de79f3b..60acb27 100644
--- a/tools/my_utils.py
+++ b/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")
\ No newline at end of file
diff --git a/tools/uvr5/webui.py b/tools/uvr5/webui.py
index a690a68..8066428 100644
--- a/tools/uvr5/webui.py
+++ b/tools/uvr5/webui.py
@@ -2,6 +2,7 @@ import os
 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 @@ is_share=eval(sys.argv[4])
 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)
diff --git a/webui.py b/webui.py
index a200a74..aee1fa9 100644
--- a/webui.py
+++ b/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}"'