feat: update batch mode

Author: Huanshere

OneKeyBatch.bat

@@ -1,14 +1,24 @@
 @echo off
-cd /d %~dp0..
-
-if exist runtime (
-    echo Using runtime folder...
-    runtime\python.exe batch\utils\batch_processor.py
-) else (
-    echo Runtime folder not found. Using conda environment...
-    call conda activate videolingo
-    python batch\utils\batch_processor.py
-    call conda deactivate
-)
+cd /D "%~dp0"
+cd ..
 
+@rem 设置环境变量
+set INSTALL_DIR=%cd%\installer_files
+set CONDA_ROOT_PREFIX=%cd%\installer_files\conda
+set INSTALL_ENV_DIR=%cd%\installer_files\env
+
+@rem 环境隔离设置
+set PYTHONNOUSERSITE=1
+set PYTHONPATH=
+set PYTHONHOME=
+set "CUDA_PATH=%INSTALL_ENV_DIR%"
+set "CUDA_HOME=%CUDA_PATH%"
+
+@rem 激活conda环境
+call "%CONDA_ROOT_PREFIX%\condabin\conda.bat" activate "%INSTALL_ENV_DIR%" || ( echo. && echo Conda environment not found && goto end )
+
+@rem 运行批处理脚本
+call python batch\utils\batch_processor.py
+
+:end
 pause

batch/OneKeyBatch.bat

@@ -31,7 +31,7 @@ Example:
 
 ### 3. Executing Batch Processing
 
-1. Double-click to run `OneKeyBatch.bat` in the root directory
+1. Double-click to run `OneKeyBatch.bat`
 2. Output files will be saved in the `output` folder
 3. Task status can be monitored in the `Status` column of `tasks_setting.xlsx`
 

batch/README.md

@@ -31,7 +31,7 @@
 
 ### 3. 运行批处理
 
-1. 双击运行根目录的 `OneKeyBatch.bat`
+1. 双击运行 `OneKeyBatch.bat`
 2. 输出文件将保存在 `output` 文件夹
 3. 任务状态可在 `tasks_setting.xlsx` 的 `Status` 列查看
 

batch/README.zh.md

@@ -4,11 +4,17 @@
 from rich.console import Console
 from rich.panel import Panel
 
+# Constants
+SETTINGS_FILE = 'batch/tasks_setting.xlsx'
+INPUT_FOLDER = os.path.join('batch', 'input')
+VALID_DUBBING_VALUES = [0, 1]
+
 console = Console()
 
 def check_settings():
-    df = pd.read_excel('batch/tasks_setting.xlsx')
-    input_files = set(os.listdir(os.path.join('batch', 'input')))
+    os.makedirs(INPUT_FOLDER, exist_ok=True)
+    df = pd.read_excel(SETTINGS_FILE)
+    input_files = set(os.listdir(INPUT_FOLDER))
     excel_files = set(df['Video File'].tolist())
     files_not_in_excel = input_files - excel_files
 
@@ -31,19 +37,14 @@ def check_settings():
 
         if video_file.startswith('http'):
             url_tasks += 1
-        elif os.path.isfile(os.path.join('batch', 'input', video_file)):
+        elif os.path.isfile(os.path.join(INPUT_FOLDER, video_file)):
             local_video_tasks += 1
         else:
             console.print(Panel(f"Invalid video file or URL 「{video_file}」", title=f"[bold red]Error in row {index + 2}", expand=False))
             all_passed = False
 
-        if not pd.isna(source_language):
-            if source_language.lower() not in ['en', 'zh', 'auto']:
-                console.print(Panel(f"Invalid source language 「{source_language}」", title=f"[bold red]Error in row {index + 2}", expand=False))
-                all_passed = False
-
         if not pd.isna(dubbing):
-            if int(dubbing) not in [0, 1]:
+            if int(dubbing) not in VALID_DUBBING_VALUES:
                 console.print(Panel(f"Invalid dubbing value 「{dubbing}」", title=f"[bold red]Error in row {index + 2}", expand=False))
                 all_passed = False
 

batch/utils/settings_check.py

@@ -1,53 +1,74 @@
 import os, sys
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
-from core import step1_ytdlp, step2_whisperX, step3_1_spacy_split, step3_2_splitbymeaning, step8_1_gen_audio_task
-from core import step4_1_summarize, step4_2_translate_all, step5_splitforsub, step6_generate_final_timeline 
-from core import step7_merge_sub_to_vid, step10_gen_audio, step11_merge_audio_to_vid
+from st_components.imports_and_utils import *
 from core.onekeycleanup import cleanup
 from core.config_utils import load_key
 import shutil
 from functools import partial
+from rich.panel import Panel
+from rich.console import Console
+
+console = Console()
+
+INPUT_DIR = 'batch/input'
+OUTPUT_DIR = 'output'
+SAVE_DIR = 'batch/output'
+ERROR_OUTPUT_DIR = 'batch/output/ERROR'
+YTB_RESOLUTION_KEY = "ytb_resolution"
 
 def process_video(file, dubbing=False, is_retry=False):
     if not is_retry:
-        prepare_output_folder('output')
+        prepare_output_folder(OUTPUT_DIR)
 
-    steps = [
-        ("Processing input file", partial(process_input_file, file)),
-        ("Transcribing with Whisper", partial(step2_whisperX.transcribe)),
-        ("Splitting sentences", split_sentences),
-        ("Summarizing and translating", summarize_and_translate),
-        ("Processing and aligning subtitles", process_and_align_subtitles),
-        ("Merging subtitles to video", step7_merge_sub_to_vid.merge_subtitles_to_video),
+    text_steps = [
+        ("🎥 Processing input file", partial(process_input_file, file)),
+        ("🎙️ Transcribing with Whisper", partial(step2_whisperX.transcribe)),
+        ("✂️ Splitting sentences", split_sentences),
+        ("📝 Summarizing and translating", summarize_and_translate),
+        ("⚡ Processing and aligning subtitles", process_and_align_subtitles),
+        ("🎬 Merging subtitles to video", step7_merge_sub_to_vid.merge_subtitles_to_video),
     ]
 
     if dubbing:
-        steps.extend([
-            ("Generating audio tasks", step8_1_gen_audio_task.gen_audio_task_main),
-            ("Generating audio using SoVITS", step10_gen_audio.process_sovits_tasks),
-            ("Merging generated audio with video", step11_merge_audio_to_vid.merge_main),
-        ])
+        dubbing_steps = [
+            ("🔊 Generating audio tasks", gen_audio_tasks),
+            ("🎵 Extracting reference audio", step9_extract_refer_audio.extract_refer_audio_main),
+            ("🗣️ Generating audio", step10_gen_audio.gen_audio),
+            ("🔄 Merging full audio", step11_merge_full_audio.merge_full_audio),
+            ("🎞️ Merging dubbing to video", step12_merge_dub_to_vid.merge_video_audio),
+        ]
+        text_steps.extend(dubbing_steps)
 
     current_step = ""
-    for step_name, step_func in steps:
+    for step_name, step_func in text_steps:
         current_step = step_name
         for attempt in range(3):
             try:
-                print(f"Executing: {step_name}...")
+                console.print(Panel(
+                    f"[bold green]{step_name}[/]",
+                    subtitle=f"Attempt {attempt + 1}/3" if attempt > 0 else None,
+                    border_style="blue"
+                ))
                 result = step_func()
                 if result is not None:
                     globals().update(result)
                 break
             except Exception as e:
                 if attempt == 2:
-                    error_message = f"Error in step '{current_step}': {str(e)}"
-                    print(error_message)
-                    cleanup("batch/output/ERROR")
-                    return False, current_step, error_message
-                print(f"Attempt {attempt + 1} failed. Retrying...")
+                    error_panel = Panel(
+                        f"[bold red]Error in step '{current_step}':[/]\n{str(e)}",
+                        border_style="red"
+                    )
+                    console.print(error_panel)
+                    cleanup(ERROR_OUTPUT_DIR)
+                    return False, current_step, str(e)
+                console.print(Panel(
+                    f"[yellow]Attempt {attempt + 1} failed. Retrying...[/]",
+                    border_style="yellow"
+                ))
 
-    print("All steps completed successfully!")
-    cleanup("batch/output")
+    console.print(Panel("[bold green]All steps completed successfully! 🎉[/]", border_style="green"))
+    cleanup(SAVE_DIR)
     return True, "", ""
 
 def prepare_output_folder(output_folder):
@@ -57,11 +78,11 @@ def prepare_output_folder(output_folder):
 
 def process_input_file(file):
     if file.startswith('http'):
-        step1_ytdlp.download_video_ytdlp(file, resolution=load_key("ytb_resolution"), cutoff_time=None)
+        step1_ytdlp.download_video_ytdlp(file, resolution=load_key(YTB_RESOLUTION_KEY), cutoff_time=None)
         video_file = step1_ytdlp.find_video_files()
     else:
         input_file = os.path.join('batch', 'input', file)
-        output_file = os.path.join('output', file)
+        output_file = os.path.join(OUTPUT_DIR, file)
         shutil.copy(input_file, output_file)
         video_file = output_file
     return {'video_file': video_file}
@@ -77,3 +98,7 @@ def summarize_and_translate():
 def process_and_align_subtitles():
     step5_splitforsub.split_for_sub_main()
     step6_generate_final_timeline.align_timestamp_main()
+
+def gen_audio_tasks():
+    step8_1_gen_audio_task.gen_audio_task_main()
+    step8_2_gen_dub_chunks.gen_dub_chunks()