Update app.py

app.py

@@ -7,7 +7,8 @@ import shutil
 import zipfile
 from datetime import datetime
 import json
-import concurrent.futures  # 新增：用于并行处理
+import concurrent.futures
+import time
 
 # 储存目录设置
 STORAGE_DIR = os.path.expanduser("~/video_storage")
@@ -216,7 +217,7 @@ def ffmpeg_cut_video(input_path, start_time, duration, output_path):
     """[优化] 快速的视频切割，使用 superfast 预设"""
     command = [
         'ffmpeg', '-i', input_path, '-ss', str(start_time), '-t', str(duration),
-        '-c:v', 'libx264', '-preset', 'superfast', '-crf', '28',  # 修改：更快的编码
+        '-c:v', 'libx264', '-preset', 'superfast', '-crf', '28',
         '-c:a', 'aac', '-b:a', '128k', '-avoid_negative_ts', 'make_zero', '-y', output_path
     ]
     result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -231,7 +232,7 @@ def ffmpeg_resize_video(input_path, output_path, target_ratio):
     
     command = [
         'ffmpeg', '-i', input_path, '-vf', filter_complex,
-        '-c:v', 'libx264', '-preset', 'superfast', '-crf', '28', '-c:a', 'copy', '-y', output_path  # 修改：更快的编码
+        '-c:v', 'libx264', '-preset', 'superfast', '-crf', '28', '-c:a', 'copy', '-y', output_path
     ]
     result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     return result.returncode == 0 and os.path.exists(output_path)
@@ -292,78 +293,100 @@ def process_single_video(video_file, clip_duration, temp_dir):
     return clips
 
 def process_videos_with_storage(video_files, clip_duration, num_output_videos, target_ratio):
-    """带储存功能的视频处理 [优化版：并行切割 + 批量更新]"""
+    """带储存功能的视频处理 [优化版：并行切割 + 批量更新 + 进度日志]"""
     if not video_files:
         return "❌ 请上传视频文件", None, "", ""
     
+    start_time = time.time()  # ✅ 记录开始时间
     temp_dir = tempfile.mkdtemp()
     
     try:
+        print(f"🔍 开始处理 {len(video_files)} 个视频文件...")
+        print(f"⏱️ 切片时长: {clip_duration} 秒 | 生成数量: {num_output_videos} 个 | 比例: {target_ratio}")
+
         all_clips = []
 
         # --- [优化] 使用线程池并行处理每个视频文件 ---
+        print(f"🚀 启动并行切片（{min(4, os.cpu_count() or 1)} 线程）...")
         with concurrent.futures.ThreadPoolExecutor(max_workers=min(4, os.cpu_count() or 1)) as executor:
-            # 提交所有任务
             future_to_video = {
                 executor.submit(process_single_video, vf, clip_duration, temp_dir): vf 
                 for vf in video_files
             }
             
-            # 收集所有切片
+            completed = 0
             for future in concurrent.futures.as_completed(future_to_video):
+                video_file = future_to_video[future]
                 try:
                     video_clips = future.result()
                     all_clips.extend(video_clips)
+                    completed += 1
+                    print(f"✅ 已完成切片: {completed}/{len(video_files)} | 文件: {os.path.basename(video_file.name)} | 切片数: {len(video_clips)}")
                 except Exception as exc:
                     video_file = future_to_video[future]
-                    print(f'处理视频 {video_file.name} 时发生异常: {exc}')
+                    print(f"❌ 切片失败: {os.path.basename(video_file.name)} - {exc}")
+
         # --- 并行处理结束 ---
+        print(f"📊 所有视频切片完成，共生成 {len(all_clips)} 个片段")
 
         if not all_clips:
             return "❌ 切割失败，请检查视频文件", None, "", ""
-        
+
         random.shuffle(all_clips)
         clips_per_video = max(1, len(all_clips) // num_output_videos)
         output_files = []
-        stored_files = [] # 用于记录成功保存的文件名
-        
+        stored_files = []
+
+        print(f"🎬 开始合并生成 {num_output_videos} 个混剪视频...")
         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]
             
             if not selected_clips:
+                print(f"⚠️ 无足够片段生成第 {i+1} 个视频，跳过")
                 continue
             
             temp_merged = os.path.join(temp_dir, f"merged_{i+1}.mp4")
+            print(f"🔗 正在合并 {len(selected_clips)} 个片段 → {temp_merged}...")
             if not concat_videos(selected_clips, temp_merged):
+                print(f"❌ 合并失败: 第 {i+1} 个视频")
                 continue
             
             timestamp = datetime.now().strftime('%H%M%S')
             final_output = os.path.join(temp_dir, f"混剪视频_{target_ratio.replace(':', 'x')}_{i+1}_{timestamp}.mp4")
+            print(f"🎬 正在调整比例 {target_ratio} → {final_output}...")
             
             if ffmpeg_resize_video(temp_merged, final_output, target_ratio):
                 output_files.append(final_output)
                 stored_path = save_to_storage(final_output)
                 if stored_path:
                     stored_files.append(os.path.basename(stored_path))
-        
+                    print(f"💾 已保存混剪视频: {os.path.basename(stored_path)}")
+                else:
+                    print(f"❌ 保存失败: {final_output}")
+            else:
+                print(f"❌ 比例调整失败: 第 {i+1} 个视频")
+
         # --- [优化] 所有文件保存后，统一更新一次配置 ---
-        if stored_files: # 只有当有文件被成功储存时才更新
+        if stored_files:
             update_storage_config()
-        # --- 优化结束 ---
-        
+            print(f"✅ 已统一更新储存配置，共保存 {len(stored_files)} 个视频文件")
+
         if not output_files:
             return "❌ 生成混剪视频失败", None, "", ""
-        
+
+        # --- 打包下载 ---
         package_dir = tempfile.mkdtemp()
         timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
         zip_path = os.path.join(package_dir, f"混剪视频包_{target_ratio.replace(':', 'x')}_{timestamp}.zip")
         
+        print(f"📦 正在打包 {len(output_files)} 个视频文件为 ZIP...")
         with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
             for video_file in output_files:
                 arcname = os.path.basename(video_file)
                 zipf.write(video_file, arcname)
+                print(f"    ➤ 已添加: {arcname}")
             
             readme = f"""# 混剪视频包
 
@@ -391,6 +414,12 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
         total_size = os.path.getsize(zip_path) / (1024 * 1024)
         platform_info = "📱 短视频平台" if target_ratio == '9:16' else "🖥️ 长视频平台"
         
+        end_time = time.time()  # ✅ 计算耗时
+        elapsed = end_time - start_time
+        print(f"🎉 混剪完成！总耗时: {elapsed:.1f} 秒")
+        print(f"📥 下载包大小: {total_size:.1f}MB")
+        print(f"📁 已保存文件: {len(stored_files)} 个")
+
         success_msg = f"""✅ 混剪完成并已储存！
 
 📊 **生成统计:**
@@ -437,10 +466,12 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
         return success_msg, zip_path, details, storage_info
         
     except Exception as e:
+        print(f"❌ 处理失败: {str(e)}")
         return f"❌ 处理失败: {str(e)}", None, "", ""
     
     finally:
         shutil.rmtree(temp_dir, ignore_errors=True)
+        print("🧹 临时文件夹已清理")
 
 def refresh_storage_display():
     """刷新储存空间显示"""