Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ETA progress, parent folder & file number options #1092

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Option: Prepend file numbers
0o120 committed Jan 9, 2024
commit a3db57d08f328c1a85792d21c3aa8feb6caf9f14
10 changes: 9 additions & 1 deletion UVR.py
Original file line number Diff line number Diff line change
@@ -3323,6 +3323,10 @@ def set_vars_for_sample_mode(event):
is_create_parent_folder_Option = ttk.Checkbutton(settings_menu_format_Frame, text=GENERATE_PARENT_FOLDER_TEXT, width=GEN_SETTINGS_WIDTH, variable=self.is_create_parent_folder_var)
is_create_parent_folder_Option.grid()
self.help_hints(is_create_parent_folder_Option, text=IS_CREATE_PARENT_FOLDER_HELP)

is_files_numbered_Option = ttk.Checkbutton(settings_menu_format_Frame, text=GENERATE_FILES_NUMBERED_TEXT, width=GEN_SETTINGS_WIDTH, variable=self.is_files_numbered_var)
is_files_numbered_Option.grid()
self.help_hints(is_files_numbered_Option, text=IS_FILES_NUMBERED_HELP)

is_accept_any_input_Option = ttk.Checkbutton(settings_menu_format_Frame, text=ACCEPT_ANY_INPUT_TEXT, width=GEN_SETTINGS_WIDTH, variable=self.is_accept_any_input_var)
is_accept_any_input_Option.grid()
@@ -6608,7 +6612,8 @@ def process_start(self):
set_progress_bar = lambda step, inference_iterations=0:self.process_update_progress(total_files=inputPath_total_len, step=(step + (inference_iterations)))
write_to_console = lambda progress_text, base_text=base_text:self.command_Text.write(base_text + progress_text)

audio_file_base = f"{file_num}_{os.path.splitext(os.path.basename(audio_file))[0]}"
audio_file_base = os.path.splitext(os.path.basename(audio_file))[0]
audio_file_base = f"{file_num}_{audio_file_base}" if self.is_files_numbered_var.get() else audio_file_base
audio_file_base = audio_file_base if not self.is_testing_audio_var.get() or is_ensemble else f"{round(time.time())}_{audio_file_base}"
audio_file_base = audio_file_base if not is_ensemble else f"{audio_file_base}_{current_model.model_basename}"
if not is_ensemble:
@@ -6846,6 +6851,7 @@ def load_saved_vars(self, data):
self.is_wav_ensemble_var = tk.BooleanVar(value=data['is_wav_ensemble'])#
self.is_create_model_folder_var = tk.BooleanVar(value=data['is_create_model_folder'])
self.is_create_parent_folder_var = tk.BooleanVar(value=data['is_create_parent_folder'])
self.is_files_numbered_var = tk.BooleanVar(value=data['is_files_numbered'])
self.help_hints_var = tk.BooleanVar(value=data['help_hints_var'])
self.model_sample_mode_var = tk.BooleanVar(value=data['model_sample_mode'])
self.model_sample_mode_duration_var = tk.StringVar(value=data['model_sample_mode_duration'])
@@ -6972,6 +6978,7 @@ def load_saved_settings(self, loaded_setting: dict, process_method=None, is_defa
self.is_task_complete_var.set(loaded_setting['is_task_complete'])
self.is_create_model_folder_var.set(loaded_setting['is_create_model_folder'])
self.is_create_parent_folder_var.set(loaded_setting['is_create_parent_folder'])
self.is_files_numbered_var.set(loaded_setting['is_files_numbered'])
self.mp3_bit_set_var.set(loaded_setting['mp3_bit_set'])
self.semitone_shift_var.set(loaded_setting['semitone_shift'])#
self.save_format_var.set(loaded_setting['save_format'])
@@ -7109,6 +7116,7 @@ def save_values(self, app_close=True, is_restart=False, is_auto_save=False):
'is_wav_ensemble': self.is_wav_ensemble_var.get(),#
'is_create_model_folder': self.is_create_model_folder_var.get(),
'is_create_parent_folder': self.is_create_parent_folder_var.get(),
'is_files_numbered': self.is_files_numbered_var.get(),
'mp3_bit_set': self.mp3_bit_set_var.get(),
'semitone_shift': self.semitone_shift_var.get(),#
'save_format': self.save_format_var.get(),
12 changes: 12 additions & 0 deletions gui_data/constants.py
Original file line number Diff line number Diff line change
@@ -649,6 +649,7 @@
'is_wav_ensemble': False,
'is_create_model_folder': False,
'is_create_parent_folder': False,
'is_files_numbered': True,
'mp3_bit_set': '320k',#
'semitone_shift': '0',#
'save_format': WAV,
@@ -761,6 +762,7 @@
'is_task_complete',
'is_create_model_folder',
'is_create_parent_folder',
'is_files_numbered',
'mp3_bit_set',#
'semitone_shift',#
'save_format',
@@ -1117,6 +1119,15 @@
' └── Album_B\n'
' └── Audio_B_(Vocals).wav\n'
' └── Audio_B_(Instrumental).wav')
IS_FILES_NUMBERED_HELP = ('Prepends a number to the saved files based on processing order.\n\n'
'• Example:\n\n'
'─ Export Directory\n'
' └── 1_Audio_X_(Vocals).wav\n'
' └── 1_Audio_X_(Instrumental).wav\n'
' └── 2_Audio_Y_(Vocals).wav\n'
' └── 2_Audio_Y_(Instrumental).wav\n'
' └── 3_Audio_Z_(Vocals).wav\n'
' └── 3_Audio_Z_(Instrumental).wav')
MDX_DIM_T_SET_HELP = INTERNAL_MODEL_ATT
MDX_DIM_F_SET_HELP = INTERNAL_MODEL_ATT

@@ -1452,6 +1463,7 @@
GENERAL_PROCESS_SETTINGS_TEXT = 'General Process Settings'
GENERATE_MODEL_FOLDER_TEXT = 'Generate Model Folder'
GENERATE_PARENT_FOLDER_TEXT = 'Generate Parent Folder'
GENERATE_FILES_NUMBERED_TEXT = 'Prepend File Numbers'
HIGHEND_PROCESS_TEXT = 'High-End Process'
INPUT_CODE_TEXT = 'Input Code'
INPUT_STEM_NAME_TEXT = 'Input Stem Name'