Update app.py

app.py

@@ -7,6 +7,7 @@ import shutil
 import zipfile
 from datetime import datetime
 import json
+import concurrent.futures  # 新增：用于并行处理
 
 # 储存目录设置
 STORAGE_DIR = os.path.expanduser("~/video_storage")
@@ -26,7 +27,7 @@ def init_storage():
             json.dump(config, f, ensure_ascii=False, indent=2)
 
 def save_to_storage(file_path, metadata=None):
-    """保存文件到储存空间"""
+    """保存文件到储存空间 [优化：移除即时更新配置]"""
     try:
         base_name = os.path.basename(file_path)
         target_path = os.path.join(STORAGE_DIR, base_name)
@@ -39,7 +40,7 @@ def save_to_storage(file_path, metadata=None):
             count += 1
         
         shutil.copy2(file_path, target_path)
-        update_storage_config()
+        # update_storage_config()  # 移除这行，在批量操作后统一更新
         return target_path
     except Exception as e:
         print(f"❌ 储存文件失败: {e}")
@@ -212,17 +213,17 @@ def clear_storage():
         return f"❌ 清空失败: {str(e)}"
 
 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', 'medium', '-crf', '23',
+        '-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)
     return result.returncode == 0 and os.path.exists(output_path)
 
 def ffmpeg_resize_video(input_path, output_path, target_ratio):
-    """稳定的比例调整"""
+    """[优化] 快速的比例调整，使用 superfast 预设"""
     if target_ratio == '9:16':
         filter_complex = "scale=1080:1920:force_original_aspect_ratio=decrease,pad=1080:1920:(ow-iw)/2:(oh-ih)/2:black"
     else:
@@ -230,7 +231,7 @@ def ffmpeg_resize_video(input_path, output_path, target_ratio):
     
     command = [
         'ffmpeg', '-i', input_path, '-vf', filter_complex,
-        '-c:v', 'libx264', '-preset', 'medium', '-crf', '23', '-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)
@@ -260,8 +261,38 @@ def concat_videos(file_list, output_path):
         except:
             pass
 
+def process_single_video(video_file, clip_duration, temp_dir):
+    """[优化] 处理单个视频文件，返回其所有切片路径的列表"""
+    video_path = video_file.name
+    clips = []
+    try:
+        # 获取视频总时长
+        cmd = ['ffprobe', '-v', 'quiet', '-show_entries', 'format=duration', '-of', 'default=noprint_wrappers=1:nokey=1', video_path]
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
+        total_duration = float(result.stdout.strip())
+    except Exception as e:
+        print(f"处理视频 {video_path} 时获取时长失败: {e}")
+        return clips
+
+    start = 0.0
+    count = 0
+    while start < total_duration:
+        duration = min(clip_duration, total_duration - start)
+        # 修改文件名，包含原始文件名和计数，避免不同视频的切片重名
+        clip_path = os.path.join(temp_dir, f"clip_{os.path.splitext(os.path.basename(video_path))[0]}_{count}.mp4")
+
+        if ffmpeg_cut_video(video_path, start, duration, clip_path):
+            clips.append(clip_path)
+        else:
+            print(f"切割视频 {video_path} 的第 {count} 个片段失败")
+
+        start += clip_duration
+        count += 1
+
+    return clips
+
 def process_videos_with_storage(video_files, clip_duration, num_output_videos, target_ratio):
-    """带储存功能的视频处理"""
+    """带储存功能的视频处理 [优化版：并行切割 + 批量更新]"""
     if not video_files:
         return "❌ 请上传视频文件", None, "", ""
     
@@ -269,36 +300,32 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
     
     try:
         all_clips = []
-        
-        for idx, video_file in enumerate(video_files):
-            video_path = video_file.name
-            
-            try:
-                cmd = ['ffprobe', '-v', 'quiet', '-show_entries', 'format=duration', '-of', 'default=noprint_wrappers=1:nokey=1', video_path]
-                result = subprocess.run(cmd, capture_output=True, text=True, timeout=10)
-                total_duration = float(result.stdout.strip())
-            except:
-                continue
+
+        # --- [优化] 使用线程池并行处理每个视频文件 ---
+        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
+            }
             
-            start = 0.0
-            count = 0
-            while start < total_duration:
-                duration = min(clip_duration, total_duration - start)
-                clip_path = os.path.join(temp_dir, f"clip_{idx}_{count}.mp4")
-                
-                if ffmpeg_cut_video(video_path, start, duration, clip_path):
-                    all_clips.append(clip_path)
-                
-                start += clip_duration
-                count += 1
-        
+            # 收集所有切片
+            for future in concurrent.futures.as_completed(future_to_video):
+                try:
+                    video_clips = future.result()
+                    all_clips.extend(video_clips)
+                except Exception as exc:
+                    video_file = future_to_video[future]
+                    print(f'处理视频 {video_file.name} 时发生异常: {exc}')
+        # --- 并行处理结束 ---
+
         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 = [] # 用于记录成功保存的文件名
         
         for i in range(num_output_videos):
             start_idx = i * clips_per_video
@@ -321,6 +348,11 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
                 if stored_path:
                     stored_files.append(os.path.basename(stored_path))
         
+        # --- [优化] 所有文件保存后，统一更新一次配置 ---
+        if stored_files: # 只有当有文件被成功储存时才更新
+            update_storage_config()
+        # --- 优化结束 ---
+        
         if not output_files:
             return "❌ 生成混剪视频失败", None, "", ""
         
@@ -632,4 +664,4 @@ def main():
     demo.launch()
 
 if __name__ == "__main__":
-    main()
+    main()