From a184662f8b1607602eae48a3da58ef18add556bd Mon Sep 17 00:00:00 2001 From: linyq Date: Sun, 3 Aug 2025 17:12:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=AD=97=E5=B9=95=E5=90=88=E5=B9=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 清理不再使用的视频字幕合并功能，包括删除合并设置组件、合并工具函数和相关的国际化文本 --- webui.py | 4 +- webui/components/merge_settings.py | 296 ----------------------------- webui/i18n/zh.json | 28 --- webui/utils/merge_video.py | 115 ----------- 4 files changed, 1 insertion(+), 442 deletions(-) delete mode 100644 webui/components/merge_settings.py delete mode 100644 webui/utils/merge_video.py diff --git a/webui.py b/webui.py index 56e2c39..b649e9d 100644 --- a/webui.py +++ b/webui.py @@ -4,7 +4,7 @@ import sys from loguru import logger from app.config import config from webui.components import basic_settings, video_settings, audio_settings, subtitle_settings, script_settings, \ - review_settings, merge_settings, system_settings + review_settings, system_settings # from webui.utils import cache, file_utils from app.utils import utils from app.utils import ffmpeg_utils @@ -221,8 +221,6 @@ def main(): # 首先渲染不依赖PyTorch的UI部分 # 渲染基础设置面板 basic_settings.render_basic_settings(tr) - # 渲染合并设置 - merge_settings.render_merge_settings(tr) # 渲染主面板 panel = st.columns(3) diff --git a/webui/components/merge_settings.py b/webui/components/merge_settings.py deleted file mode 100644 index fe35f7a..0000000 --- a/webui/components/merge_settings.py +++ /dev/null @@ -1,296 +0,0 @@ -import os -import time -import streamlit as st -from loguru import logger -from typing import List, Dict -from dataclasses import dataclass -from streamlit.runtime.uploaded_file_manager import UploadedFile - -from webui.utils.merge_video import merge_videos_and_subtitles -from app.utils.utils import video_dir, srt_dir - -# 定义临时目录路径 -TEMP_MERGE_DIR = os.path.join("storage", "temp", "merge") - -# 确保临时目录存在 -os.makedirs(TEMP_MERGE_DIR, exist_ok=True) - - -@dataclass -class VideoSubtitlePair: - video_file: UploadedFile | None - subtitle_file: str | None - base_name: str - order: int = 0 - - -def save_uploaded_file(uploaded_file: UploadedFile, target_dir: str) -> str: - """Save uploaded file to target directory and return the file path""" - file_path = os.path.join(target_dir, uploaded_file.name) - # 如果文件已存在，先删除它 - if os.path.exists(file_path): - os.remove(file_path) - with open(file_path, "wb") as f: - f.write(uploaded_file.getvalue()) - return file_path - - -def clean_temp_dir(): - """清空临时目录""" - if os.path.exists(TEMP_MERGE_DIR): - for file in os.listdir(TEMP_MERGE_DIR): - file_path = os.path.join(TEMP_MERGE_DIR, file) - try: - if os.path.isfile(file_path): - os.unlink(file_path) - except Exception as e: - logger.error(f"清理临时文件失败: {str(e)}") - - -def group_files(files: List[UploadedFile]) -> Dict[str, VideoSubtitlePair]: - """Group uploaded files by their base names""" - pairs = {} - order_counter = 0 - - # 首先处理所有视频文件 - for file in files: - base_name = os.path.splitext(file.name)[0] - ext = os.path.splitext(file.name)[1].lower() - - if ext == ".mp4": - if base_name not in pairs: - pairs[base_name] = VideoSubtitlePair(None, None, base_name, order_counter) - order_counter += 1 - pairs[base_name].video_file = file - # 保存视频文件到临时目录 - video_path = save_uploaded_file(file, TEMP_MERGE_DIR) - - # 然后处理所有字幕文件 - for file in files: - base_name = os.path.splitext(file.name)[0] - ext = os.path.splitext(file.name)[1].lower() - - if ext == ".srt": - # 即使没有对应视频也保存字幕文件 - subtitle_path = os.path.join(TEMP_MERGE_DIR, f"{base_name}.srt") - save_uploaded_file(file, TEMP_MERGE_DIR) - - if base_name in pairs: # 如果有对应的视频 - pairs[base_name].subtitle_file = subtitle_path - - return pairs - - -def render_merge_settings(tr): - """Render the merge settings section""" - with st.expander(tr("Video Subtitle Merge"), expanded=False): - # 上传文件区域 - uploaded_files = st.file_uploader( - tr("Upload Video and Subtitle Files"), - type=["mp4", "srt"], - accept_multiple_files=True, - key="merge_files" - ) - - if uploaded_files: - all_pairs = group_files(uploaded_files) - - if all_pairs: - st.write(tr("All Uploaded Files")) - - # 初始化或更新session state中的排序信息 - if 'file_orders' not in st.session_state: - st.session_state.file_orders = { - name: pair.order for name, pair in all_pairs.items() - } - st.session_state.needs_reorder = False - - # 确保所有新文件都有排序值 - for name, pair in all_pairs.items(): - if name not in st.session_state.file_orders: - st.session_state.file_orders[name] = pair.order - - # 移除不存在的文件的排序值 - st.session_state.file_orders = { - k: v for k, v in st.session_state.file_orders.items() - if k in all_pairs - } - - # 按照排序值对文件对进行排序 - sorted_pairs = sorted( - all_pairs.items(), - key=lambda x: st.session_state.file_orders[x[0]] - ) - - # 计算需要多少行来显示所有视频（每行5个） - num_pairs = len(sorted_pairs) - num_rows = (num_pairs + 4) // 5 # 向上取整,每行5个 - - # 遍历每一行 - for row in range(num_rows): - # 创建5列 - cols = st.columns(5) - - # 在这一行中填充视频（最多5个） - for col_idx in range(5): - pair_idx = row * 5 + col_idx - if pair_idx < num_pairs: - base_name, pair = sorted_pairs[pair_idx] - with cols[col_idx]: - st.caption(base_name) - - # 显示视频预览（如果存在） - video_path = os.path.join(TEMP_MERGE_DIR, f"{base_name}.mp4") - if os.path.exists(video_path): - st.video(video_path) - else: - st.warning(tr("Missing Video")) - - # 显示字幕预览（如果存在） - subtitle_path = os.path.join(TEMP_MERGE_DIR, f"{base_name}.srt") - if os.path.exists(subtitle_path): - with open(subtitle_path, 'r', encoding='utf-8') as f: - subtitle_content = f.read() - st.markdown(tr("Subtitle Preview")) - st.text_area( - "Subtitle Content", - value=subtitle_content, - height=100, # 减高度以适应5列布局 - label_visibility="collapsed", - key=f"subtitle_preview_{base_name}" - ) - else: - st.warning(tr("Missing Subtitle")) - # 如果有视频但没有字幕，显示一键转录按钮 - # if os.path.exists(video_path): - # if st.button(tr("One-Click Transcribe"), key=f"transcribe_{base_name}"): - # with st.spinner(tr("Transcribing...")): - # try: - # # 生成字幕文件 - # result = extract_audio_and_create_subtitle(video_path, subtitle_path) - # if result: - # # 读取生成的字幕文件内容并显示预览 - # with open(subtitle_path, 'r', encoding='utf-8') as f: - # subtitle_content = f.read() - # st.markdown(tr("Subtitle Preview")) - # st.text_area( - # "Subtitle Content", - # value=subtitle_content, - # height=150, - # label_visibility="collapsed", - # key=f"subtitle_preview_transcribed_{base_name}" - # ) - # st.success(tr("Transcription Complete!")) - # # 更新pair的字幕文件路径 - # pair.subtitle_file = subtitle_path - # else: - # st.error(tr("Transcription Failed. Please try again.")) - # except Exception as e: - # error_message = str(e) - # logger.error(traceback.format_exc()) - # if "rate limit exceeded" in error_message.lower(): - # st.error(tr("API rate limit exceeded. Please wait about an hour and try again.")) - # elif "resource_exhausted" in error_message.lower(): - # st.error(tr("Resources exhausted. Please try again later.")) - # else: - # st.error(f"{tr('Transcription Failed')}: {str(e)}") - - # 排序输入框 - order = st.number_input( - tr("Order"), - min_value=0, - value=st.session_state.file_orders[base_name], - key=f"order_{base_name}", - on_change=lambda: setattr(st.session_state, 'needs_reorder', True) - ) - if order != st.session_state.file_orders[base_name]: - st.session_state.file_orders[base_name] = order - st.session_state.needs_reorder = True - - # 如果需要重新排序，重新加载页面 - if st.session_state.needs_reorder: - st.session_state.needs_reorder = False - st.rerun() - - # 找出有完整视频和字幕的文件对 - complete_pairs = { - k: v for k, v in all_pairs.items() - if os.path.exists(os.path.join(TEMP_MERGE_DIR, f"{k}.mp4")) and - os.path.exists(os.path.join(TEMP_MERGE_DIR, f"{k}.srt")) - } - - # 合并按钮和结果显示 - cols = st.columns([1, 2, 1]) - with cols[0]: - st.write(f"{tr('Mergeable Files')}: {len(complete_pairs)}") - - merge_videos_result = None - - with cols[1]: - if st.button(tr("Merge All Files"), type="primary", use_container_width=True): - try: - # 获取排序后的完整文件对 - sorted_complete_pairs = sorted( - [(k, v) for k, v in complete_pairs.items()], - key=lambda x: st.session_state.file_orders[x[0]] - ) - - video_paths = [] - subtitle_paths = [] - for base_name, _ in sorted_complete_pairs: - video_paths.append(os.path.join(TEMP_MERGE_DIR, f"{base_name}.mp4")) - subtitle_paths.append(os.path.join(TEMP_MERGE_DIR, f"{base_name}.srt")) - - # 获取输出文件路径 - output_video = os.path.join(video_dir(), f"merged_video_{time.strftime('%M%S')}.mp4") - output_subtitle = os.path.join(srt_dir(), f"merged_subtitle_{time.strftime('%M%S')}.srt") - - with st.spinner(tr("Merging files...")): - # 合并文件 - merge_videos_and_subtitles( - video_paths, - subtitle_paths, - output_video, - output_subtitle - ) - - success = True - error_msg = "" - - # 检查输出文件是否成功生成 - if not os.path.exists(output_video): - success = False - error_msg += tr("Failed to generate merged video. ") - if not os.path.exists(output_subtitle): - success = False - error_msg += tr("Failed to generate merged subtitle. ") - - if success: - # 显示成功消息 - st.success(tr("Merge completed!")) - merge_videos_result = (output_video, output_subtitle) - # 清理临时目录 - clean_temp_dir() - else: - st.error(error_msg) - - except Exception as e: - error_message = str(e) - if "moviepy" in error_message.lower(): - st.error(tr("Error processing video files. Please check if the videos are valid MP4 files.")) - # elif "pysrt" in error_message.lower(): - # st.error(tr("Error processing subtitle files. Please check if the subtitles are valid SRT files.")) - else: - st.error(f"{tr('Error during merge')}: {error_message}") - - # 合并结果预览放在合并按钮下方 - if merge_videos_result: - st.markdown(f"

{tr('Merge Result Preview')}

", unsafe_allow_html=True) - # 使用列布局使视频居中 - col1, col2, col3 = st.columns([1,2,1]) - with col2: - st.video(merge_videos_result[0]) - st.code(f"{tr('Video Path')}: {merge_videos_result[0]}") - st.code(f"{tr('Subtitle Path')}: {merge_videos_result[1]}") - else: - st.warning(tr("No Files Found")) diff --git a/webui/i18n/zh.json b/webui/i18n/zh.json index 61c0e11..d137ccf 100644 --- a/webui/i18n/zh.json +++ b/webui/i18n/zh.json @@ -136,31 +136,6 @@ "Script Uploaded Successfully": "脚本上传成功", "Invalid JSON format": "无效的JSON格式", "Upload failed": "上传失败", - "Video Subtitle Merge": "**合并视频与字幕**", - "Upload Video and Subtitle Files": "上传视频和字幕文件", - "Matched File Pairs": "已匹配的文件对", - "Merge All Files": "合并所有文件", - "Merge Function Not Implemented": "合并功能待实现", - "No Matched Pairs Found": "未找到匹配的文件对", - "Missing Subtitle": "缺少对应的字幕文件, 请使用其他软件完成字幕转录，比如剪映等", - "Missing Video": "缺少对应的视频文件", - "All Uploaded Files": "所有上传的文件", - "Order": "排序序号", - "Reorder": "重新排序", - "Merging files...": "正在合并文件...", - "Merge completed!": "合并完成！", - "Download Merged Video": "下载合并后的视频", - "Download Merged Subtitle": "下载合并后的字幕", - "Error during merge": "合并过程中出错", - "Failed to generate merged video.": "生成合并视频失败。", - "Failed to generate merged subtitle.": "生成合并字幕失败。", - "Error reading merged video file": "读取合并后的视频文件时出错", - "Error reading merged subtitle file": "读取合并后的字幕文件时出错", - "Error processing video files. Please check if the videos are valid MP4 files.": "处理视频文件时出错。请检查视频是否为有效的MP4文件。", - "Error processing subtitle files. Please check if the subtitles are valid SRT files.": "处理字幕文件时出错。请检查字幕是否为有效的SRT文件。", - "Preview Merged Video": "预览合并后的视频", - "Video Path": "视频路径", - "Subtitle Path": "字幕路径", "Enable Proxy": "启用代理", "QwenVL model is available": "QwenVL 模型可用", "QwenVL model is not available": "QwenVL 模型不可用", @@ -183,9 +158,6 @@ "API rate limit exceeded. Please wait about an hour and try again.": "API 调用次数已达到限制，请等待约一小时后再试。", "Resources exhausted. Please try again later.": "资源已耗尽，请稍后再试。", "Transcription Failed": "转录失败", - "Mergeable Files": "可合并文件数", - "Subtitle Content": "字幕内容", - "Merge Result Preview": "合并结果预览", "Short Generate": "短剧混剪 (高燃剪辑)", "Generate Short Video Script": "AI生成短剧混剪脚本", "Adjust the volume of the original audio": "调整原始音频的音量", diff --git a/webui/utils/merge_video.py b/webui/utils/merge_video.py deleted file mode 100644 index 9d21de3..0000000 --- a/webui/utils/merge_video.py +++ /dev/null @@ -1,115 +0,0 @@ -""" -合并视频和字幕文件 -""" -import os -import pysrt -from moviepy import VideoFileClip, concatenate_videoclips - - -def get_video_duration(video_path): - """获取视频时长（秒）""" - video = VideoFileClip(video_path) - duration = video.duration - video.close() - return duration - - -def adjust_subtitle_timing(subtitle_path, time_offset): - """调整字幕时间戳""" - subs = pysrt.open(subtitle_path) - - # 为每个字幕项添加时间偏移 - for sub in subs: - sub.start.hours += int(time_offset / 3600) - sub.start.minutes += int((time_offset % 3600) / 60) - sub.start.seconds += int(time_offset % 60) - sub.start.milliseconds += int((time_offset * 1000) % 1000) - - sub.end.hours += int(time_offset / 3600) - sub.end.minutes += int((time_offset % 3600) / 60) - sub.end.seconds += int(time_offset % 60) - sub.end.milliseconds += int((time_offset * 1000) % 1000) - - return subs - - -def merge_videos_and_subtitles(video_paths, subtitle_paths, output_video_path, output_subtitle_path): - """合并视频和字幕文件""" - if len(video_paths) != len(subtitle_paths): - raise ValueError("视频文件数量与字幕文件数量不匹配") - - # 1. 合并视频 - video_clips = [] - accumulated_duration = 0 - merged_subs = pysrt.SubRipFile() - - try: - # 处理所有视频和字幕 - for i, (video_path, subtitle_path) in enumerate(zip(video_paths, subtitle_paths)): - # 添加视频 - print(f"处理视频 {i + 1}/{len(video_paths)}: {video_path}") - video_clip = VideoFileClip(video_path) - video_clips.append(video_clip) - - # 处理字幕 - print(f"处理字幕 {i + 1}/{len(subtitle_paths)}: {subtitle_path}") - if i == 0: - # 第一个字幕文件直接读取 - current_subs = pysrt.open(subtitle_path) - else: - # 后续字幕文件需要调整时间戳 - current_subs = adjust_subtitle_timing(subtitle_path, accumulated_duration) - - # 合并字幕 - merged_subs.extend(current_subs) - - # 更新累计时长 - accumulated_duration += video_clip.duration - - # 判断视频是否存在，若已经存在不重复合并 - if not os.path.exists(output_video_path): - print("合并视频中...") - final_video = concatenate_videoclips(video_clips) - - # 保存合并后的视频 - print("保存合并后的视频...") - final_video.write_videofile(output_video_path, audio_codec='aac') - - # 保存合并后的字幕 - print("保存合并后的字幕...") - merged_subs.save(output_subtitle_path, encoding='utf-8') - - print("合并完成") - - finally: - # 清理资源 - for clip in video_clips: - clip.close() - - -def main(): - # 示例用法 - video_paths = [ - "temp/1.mp4", - "temp/2.mp4", - "temp/3.mp4", - "temp/4.mp4", - "temp/5.mp4", - ] - - subtitle_paths = [ - "temp/1.srt", - "temp/2.srt", - "temp/3.srt", - "temp/4.srt", - "temp/5.srt", - ] - - output_video_path = "temp/merged_video.mp4" - output_subtitle_path = "temp/merged_subtitle.srt" - - merge_videos_and_subtitles(video_paths, subtitle_paths, output_video_path, output_subtitle_path) - - -if __name__ == "__main__": - main()