Update app.py

app.py

@@ -4,7 +4,6 @@ import tempfile
 import random
 import subprocess
 import shutil
-from datetime import datetime
 
 def ffmpeg_cut_video(input_path, start_time, duration, output_path):
     command = [
@@ -23,7 +22,6 @@ def concat_videos_ffmpeg(file_list, output_path):
     list_file = tempfile.NamedTemporaryFile(delete=False, mode='w', suffix='.txt')
     try:
         for f in file_list:
-            # 安全写入文件名，避免单引号破坏格式
             list_file.write("file '{}'\n".format(f.replace("'", r"'\''")))
         list_file.close()
 
@@ -41,17 +39,12 @@ def concat_videos_ffmpeg(file_list, output_path):
     finally:
         os.unlink(list_file.name)
 
-def process_videos(video_files, clip_duration=2, num_output_videos=3):
-    if not video_files or len(video_files) == 0:
-        return "❌ 请上传至少一个视频文件", []
-
+def extract_clips_from_videos(video_files, clip_duration):
+    clips = []
     temp_dir = tempfile.mkdtemp()
-    all_clips = []
-
     try:
         for idx, video_file in enumerate(video_files):
             video_path = video_file.name
-            # 获取视频时长
             cmd_duration = [
                 'ffprobe', '-v', 'error', 
                 '-show_entries', 'format=duration',
@@ -67,48 +60,63 @@ def process_videos(video_files, clip_duration=2, num_output_videos=3):
                 clip_path = os.path.join(temp_dir, f"clip_{idx}_{count}.mp4")
                 ok = ffmpeg_cut_video(video_path, start, duration, clip_path)
                 if not ok:
-                    return f"❌ 视频剪辑失败: {video_path}", []
-                all_clips.append(clip_path)
+                    raise RuntimeError(f"视频剪辑失败: {video_path}")
+                clips.append(clip_path)
                 start += duration
                 count += 1
+        return clips, temp_dir
+    except Exception:
+        shutil.rmtree(temp_dir, ignore_errors=True)
+        raise
 
-        random.shuffle(all_clips)
-
-        clips_per_video = max(1, len(all_clips) // num_output_videos)
-        output_files = []
-
+def generate_mixed_videos(clips, num_output_videos):
+    temp_dir = tempfile.mkdtemp()
+    random.shuffle(clips)
+    clips_per_video = max(1, len(clips) // num_output_videos)
+    output_files = []
+    try:
         for i in range(num_output_videos):
             start_idx = i * clips_per_video
-            end_idx = len(all_clips) if i == num_output_videos - 1 else (start_idx + clips_per_video)
-            selected_clips = all_clips[start_idx:end_idx]
-            output_path = os.path.join(temp_dir, f"mixed_video_{i + 1}.mp4")
+            end_idx = len(clips) if i == num_output_videos - 1 else (start_idx + clips_per_video)
+            selected_clips = clips[start_idx:end_idx]
+            output_path = os.path.join(temp_dir, f"mixed_video_{i+1}.mp4")
             ok = concat_videos_ffmpeg(selected_clips, output_path)
             if not ok:
-                return "❌ 视频合并失败", []
+                raise RuntimeError("视频合并失败")
             output_files.append(output_path)
+        return output_files, temp_dir
+    except Exception:
+        shutil.rmtree(temp_dir, ignore_errors=True)
+        raise
 
-        return f"成功生成 {len(output_files)} 个混剪视频", output_files
-
+def process_auto_mixing(video_files, clip_duration, num_output_videos):
+    if not video_files or len(video_files) == 0:
+        return "❌ 请上传至少一个视频文件", []
+    try:
+        clips, clips_temp_dir = extract_clips_from_videos(video_files, clip_duration)
+        output_files, output_temp_dir = generate_mixed_videos(clips, num_output_videos)
+        # 清理临时切割片段目录
+        shutil.rmtree(clips_temp_dir, ignore_errors=True)
+        return f"成功生成 {len(output_files)} 个自动混剪视频", output_files
     except Exception as e:
-        return f"❌ 处理异常: {str(e)}", []
+        return f"❌ 处理失败: {str(e)}", []
 
 def main():
     with gr.Blocks() as demo:
-        gr.Markdown("## FFmpeg 自动剪辑混剪视频 (无 API，纯本地 ffmpeg)")
-        video_input = gr.File(file_types=[".mp4", ".mov", ".avi", ".mkv"], file_count="multiple", label="上传视频文件")
-        clip_duration = gr.Number(value=2, label="剪辑片段时长 (秒)", minimum=1, maximum=30)
-        num_output = gr.Number(value=3, label="输出混剪视频数量", minimum=1, maximum=10)
-        btn = gr.Button("开始剪辑")
+        gr.Markdown("# FFmpeg 自动剪辑 + 长视频自动切片 + 自动混剪")
 
-        status = gr.Textbox(label="剪辑状态", interactive=False, lines=5)
-        outputs = gr.File(file_count="multiple", label="下载混剪视频")
+        video_input = gr.File(label="上传视频文件", file_types=[".mp4", ".mov", ".avi"], file_count="multiple")
+        clip_duration = gr.Number(value=8, label="单个剪辑片段时长（秒）", minimum=1, maximum=60)
+        num_output = gr.Number(value=3, label="生成混剪视频数量", minimum=1, maximum=10)
+        btn = gr.Button("开始自动剪辑并混剪")
 
-        def process(video_files, clip_duration, num_output):
-            return process_videos(video_files, clip_duration, num_output)
+        status_box = gr.Textbox(label="处理状态", interactive=False, lines=4)
+        output_files = gr.File(label="下载混剪视频文件", file_count="multiple")
 
-        btn.click(process, inputs=[video_input, clip_duration, num_output], outputs=[status, outputs])
+        btn.click(process_auto_mixing, inputs=[video_input, clip_duration, num_output], outputs=[status_box, output_files])
 
     demo.launch()
 
 if __name__ == "__main__":
     main()
+