From 3cdbd45632f687f76fa6219aa8a45c7cf2bc367d Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 13 May 2024 00:33:59 +0800
Subject: [PATCH] Adopt any directory format

Signed-off-by: Xavier Lau <xavier@inv.cafe>
---
 infer/modules/uvr5/mdxnet.py  | 8 ++------
 infer/modules/uvr5/modules.py | 3 +--
 infer/modules/uvr5/vr.py      | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/infer/modules/uvr5/mdxnet.py b/infer/modules/uvr5/mdxnet.py
index 2f246db..25edd98 100644
--- a/infer/modules/uvr5/mdxnet.py
+++ b/infer/modules/uvr5/mdxnet.py
@@ -219,18 +219,14 @@ class Predictor:
             opt_path_vocal = path_vocal[:-4] + ".%s" % format
             opt_path_other = path_other[:-4] + ".%s" % format
             if os.path.exists(path_vocal):
-                os.system(
-                    "ffmpeg -i %s -vn %s -q:a 2 -y" % (path_vocal, opt_path_vocal)
-                )
+                os.system(f'ffmpeg -i "{path_vocal}" -vn "{opt_path_vocal}" -q:a 2 -y')
                 if os.path.exists(opt_path_vocal):
                     try:
                         os.remove(path_vocal)
                     except:
                         pass
             if os.path.exists(path_other):
-                os.system(
-                    "ffmpeg -i %s -vn %s -q:a 2 -y" % (path_other, opt_path_other)
-                )
+                os.system(f'ffmpeg -i "{path_other}" -vn "{opt_path_other}" -q:a 2 -y')
                 if os.path.exists(opt_path_other):
                     try:
                         os.remove(path_other)
diff --git a/infer/modules/uvr5/modules.py b/infer/modules/uvr5/modules.py
index 2abb62d..2f5f687 100644
--- a/infer/modules/uvr5/modules.py
+++ b/infer/modules/uvr5/modules.py
@@ -65,8 +65,7 @@ def uvr(model_name, inp_root, save_root_vocal, paths, save_root_ins, agg, format
                     os.path.basename(inp_path),
                 )
                 os.system(
-                    "ffmpeg -i %s -vn -acodec pcm_s16le -ac 2 -ar 44100 %s -y"
-                    % (inp_path, tmp_path)
+                    f'ffmpeg -i "{inp_path}" -vn -acodec pcm_s16le -ac 2 -ar 44100 "{tmp_path}" -y'
                 )
                 inp_path = tmp_path
             try:
diff --git a/infer/modules/uvr5/vr.py b/infer/modules/uvr5/vr.py
index ed57784..fe922b2 100644
--- a/infer/modules/uvr5/vr.py
+++ b/infer/modules/uvr5/vr.py
@@ -146,7 +146,7 @@ class AudioPre:
                 )
                 if os.path.exists(path):
                     opt_format_path = path[:-4] + ".%s" % format
-                    os.system("ffmpeg -i %s -vn %s -q:a 2 -y" % (path, opt_format_path))
+                    os.system(f'ffmpeg -i "{path}" -vn "{opt_format_path}" -q:a 2 -y')
                     if os.path.exists(opt_format_path):
                         try:
                             os.remove(path)
@@ -187,7 +187,7 @@ class AudioPre:
                 )
                 if os.path.exists(path):
                     opt_format_path = path[:-4] + ".%s" % format
-                    os.system("ffmpeg -i %s -vn %s -q:a 2 -y" % (path, opt_format_path))
+                    os.system(f'ffmpeg -i "{path}" -vn "{opt_format_path}" -q:a 2 -y')
                     if os.path.exists(opt_format_path):
                         try:
                             os.remove(path)
@@ -323,7 +323,7 @@ class AudioPreDeEcho:
                 )
                 if os.path.exists(path):
                     opt_format_path = path[:-4] + ".%s" % format
-                    os.system("ffmpeg -i %s -vn %s -q:a 2 -y" % (path, opt_format_path))
+                    os.system(f'ffmpeg -i "{path}" -vn "{opt_format_path}" -q:a 2 -y')
                     if os.path.exists(opt_format_path):
                         try:
                             os.remove(path)
@@ -360,7 +360,7 @@ class AudioPreDeEcho:
                 )
                 if os.path.exists(path):
                     opt_format_path = path[:-4] + ".%s" % format
-                    os.system("ffmpeg -i %s -vn %s -q:a 2 -y" % (path, opt_format_path))
+                    os.system(f'ffmpeg -i "{path}" -vn "{opt_format_path}" -q:a 2 -y')
                     if os.path.exists(opt_format_path):
                         try:
                             os.remove(path)