Cool_Tools/ultimatevocalremovergui
1
0
Fork 0
mirror of https://github.com/Anjok07/ultimatevocalremovergui.git synced 2025-02-23 13:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring code

Browse Source
This commit is contained in:
Dilan Boskan 2021-01-16 16:07:05 +01:00
parent 925086d19a
commit ec50ed0562
2 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
inference_v2.py
View File

@ -139,28 +139,32 @@ def update_constants(model_name):
pass pass
def determineModelFolderName(): def determineExportPath():
""" """
Determine the name that is used for the folder and appended Determine the path, where the music file is stored
to the back of the music files
""" """
modelFolderName = '' folder_path = data["export_path"]
if not data['modelFolder']:
# Model Test Mode not selected
return modelFolderName
# -Instrumental- if data['modelFolder']:
if os.path.isfile(data['instrumentalModel']): # Model Test Mode selected
modelFolderName += os.path.splitext(os.path.basename(data['instrumentalModel']))[0] folder_name = ''
# -Vocal- # -Instrumental-
elif os.path.isfile(data['vocalModel']): if os.path.isfile(data['instrumentalModel']):
modelFolderName += os.path.splitext(os.path.basename(data['vocalModel']))[0] folder_name += os.path.splitext(os.path.basename(data['instrumentalModel']))[0]
# -Stack- # -Vocal-
if os.path.isfile(data['stackModel']): elif os.path.isfile(data['vocalModel']):
modelFolderName += '-' + os.path.splitext(os.path.basename(data['stackModel']))[0] folder_name += os.path.splitext(os.path.basename(data['vocalModel']))[0]
# -Stack-
if os.path.isfile(data['stackModel']):
folder_name += '-' + os.path.splitext(os.path.basename(data['stackModel']))[0]
return modelFolderName # Add generated folder name to export Path
folder_path = os.path.join(folder_path, folder_name)
if not os.path.isdir(folder_path):
# Folder does not exist
os.mkdir(folder_path)
return folder_path
def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress_var: tk.Variable, def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress_var: tk.Variable,
**kwargs: dict): **kwargs: dict):
@ -372,12 +376,7 @@ def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress
button_widget.configure(state=tk.DISABLED) # Disable Button button_widget.configure(state=tk.DISABLED) # Disable Button
models, devices = load_models() models, devices = load_models()
folder_path = data["export_path"] folder_path = determineExportPath()
modelFolderName = determineModelFolderName()
if modelFolderName:
folder_path = os.path.join(data["export_path"], modelFolderName)
if not os.path.isdir(folder_path):
os.mkdir(folder_path)
# Determine Loops # Determine Loops
total_loops = data['stackPasses'] total_loops = data['stackPasses']
@ -386,7 +385,8 @@ def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress
for file_num, music_file in enumerate(data['input_paths'], start=1): for file_num, music_file in enumerate(data['input_paths'], start=1):
# Determine File Name # Determine File Name
base_name = os.path.join(folder_path, f'{file_num}_{os.path.splitext(os.path.basename(music_file))[0]}') base_name = os.path.join(folder_path,
f'{file_num}_{os.path.splitext(os.path.basename(music_file))[0]}')
try: try:
for loop_num in range(total_loops): for loop_num in range(total_loops):
# -Determine which model will be used- # -Determine which model will be used-

50
inference_v4.py
View File

@ -259,27 +259,32 @@ def update_constants(model_name):
pass pass
def determineModelFolderName(): def determineExportPath():
""" """
Determine the name that is used for the folder and appended Determine the path, where the music file is stored
to the back of the music files
""" """
modelFolderName = '' folder_path = data["export_path"]
if not data['modelFolder']:
# Model Test Mode not selected
return modelFolderName
# -Instrumental- if data['modelFolder']:
if os.path.isfile(data['instrumentalModel']): # Model Test Mode selected
modelFolderName += os.path.splitext(os.path.basename(data['instrumentalModel']))[0] folder_name = ''
# -Vocal- # -Instrumental-
elif os.path.isfile(data['vocalModel']): if os.path.isfile(data['instrumentalModel']):
modelFolderName += os.path.splitext(os.path.basename(data['vocalModel']))[0] folder_name += os.path.splitext(os.path.basename(data['instrumentalModel']))[0]
# -Stack- # -Vocal-
if os.path.isfile(data['stackModel']): elif os.path.isfile(data['vocalModel']):
modelFolderName += '-' + os.path.splitext(os.path.basename(data['stackModel']))[0] folder_name += os.path.splitext(os.path.basename(data['vocalModel']))[0]
# -Stack-
if os.path.isfile(data['stackModel']):
folder_name += '-' + os.path.splitext(os.path.basename(data['stackModel']))[0]
return modelFolderName # Add generated folder name to export Path
folder_path = os.path.join(folder_path, folder_name)
if not os.path.isdir(folder_path):
# Folder does not exist
os.mkdir(folder_path)
return folder_path
def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress_var: tk.Variable, def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress_var: tk.Variable,
@ -363,6 +368,7 @@ def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress
data.update(kwargs) data.update(kwargs)
# --Setup--
# Update default settings # Update default settings
global default_sr global default_sr
global default_hop_length global default_hop_length
@ -379,12 +385,7 @@ def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress
button_widget.configure(state=tk.DISABLED) # Disable Button button_widget.configure(state=tk.DISABLED) # Disable Button
vocal_remover = VocalRemover(data, text_widget) vocal_remover = VocalRemover(data, text_widget)
folder_path = data["export_path"] folder_path = determineExportPath()
modelFolderName = determineModelFolderName()
if modelFolderName:
folder_path = os.path.join(data["export_path"], modelFolderName)
if not os.path.isdir(folder_path):
os.mkdir(folder_path)
# Determine Loops # Determine Loops
total_loops = data['stackPasses'] total_loops = data['stackPasses']
@ -392,7 +393,8 @@ def main(window: tk.Wm, text_widget: tk.Text, button_widget: tk.Button, progress
total_loops += 1 total_loops += 1
for file_num, music_file in enumerate(data['input_paths'], start=1): for file_num, music_file in enumerate(data['input_paths'], start=1):
# Determine File Name # Determine File Name
base_name = os.path.join(folder_path, f'{file_num}_{os.path.splitext(os.path.basename(music_file))[0]}') base_name = os.path.join(folder_path,
f'{file_num}_{os.path.splitext(os.path.basename(music_file))[0]}')
try: try:
# --Seperate Music Files-- # --Seperate Music Files--
for loop_num in range(total_loops): for loop_num in range(total_loops):