Update app.py

app.py

@@ -39,10 +39,7 @@ def save_to_storage(file_path, metadata=None):
             count += 1
         
         shutil.copy2(file_path, target_path)
-        
-        # 更新配置
         update_storage_config()
-        
         return target_path
     except Exception as e:
         print(f"❌ 储存文件失败: {e}")
@@ -74,7 +71,6 @@ def get_storage_info():
         else:
             config = {"total_videos": 0, "total_size_mb": 0}
         
-        # 获取视频文件列表
         video_files = []
         if os.path.exists(STORAGE_DIR):
             for f in os.listdir(STORAGE_DIR):
@@ -88,13 +84,105 @@ def get_storage_info():
                         "modified": mod_time.strftime('%Y-%m-%d %H:%M')
                     })
         
-        # 按修改时间排序
         video_files.sort(key=lambda x: x["modified"], reverse=True)
-        
         return config, video_files
     except:
         return {"total_videos": 0, "total_size_mb": 0}, []
 
+def download_all_storage():
+    """一键下载储存空间所有视频"""
+    try:
+        config, video_files = get_storage_info()
+        
+        if not video_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"储存空间全部视频_{timestamp}.zip")
+        
+        with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
+            for video in video_files:
+                video_path = os.path.join(STORAGE_DIR, video['name'])
+                if os.path.exists(video_path):
+                    zipf.write(video_path, video['name'])
+            
+            # 添加清单
+            manifest = f"""# 储存空间视频清单
+
+## 📊 下载信息
+- 下载时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
+- 视频总数: {len(video_files)} 个
+- 总大小: {config['total_size_mb']}MB
+
+## 📁 文件列表
+"""
+            for video in video_files:
+                manifest += f"- {video['name']} ({video['size_mb']}MB) - {video['modified']}\n"
+            
+            manifest += """
+## 💡 使用说明
+这些是您的储存空间中保存的所有混剪视频，可直接使用或进一步编辑。
+
+---
+FFmpeg 储存管理系统
+"""
+            
+            zipf.writestr("视频清单.txt", manifest.encode('utf-8'))
+        
+        download_msg = f"✅ 已打包 {len(video_files)} 个视频文件，总大小 {config['total_size_mb']}MB"
+        return zip_path, download_msg
+        
+    except Exception as e:
+        return None, f"❌ 打包下载失败: {str(e)}"
+
+def download_selected_storage(selected_files):
+    """下载选中的储存文件"""
+    try:
+        if not selected_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"选中视频_{timestamp}.zip")
+        
+        total_size = 0
+        with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
+            valid_files = []
+            for filename in selected_files:
+                video_path = os.path.join(STORAGE_DIR, filename)
+                if os.path.exists(video_path):
+                    zipf.write(video_path, filename)
+                    size_mb = os.path.getsize(video_path) / (1024 * 1024)
+                    total_size += size_mb
+                    valid_files.append({"name": filename, "size_mb": round(size_mb, 1)})
+            
+            if not valid_files:
+                return None, "❌ 选中的文件都不存在"
+            
+            # 添加清单
+            manifest = f"""# 选中视频下载清单
+
+## 📊 下载信息
+- 下载时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
+- 选中文件: {len(valid_files)} 个
+- 总大小: {round(total_size, 1)}MB
+
+## 📁 文件列表
+"""
+            for video in valid_files:
+                manifest += f"- {video['name']} ({video['size_mb']}MB)\n"
+            
+            zipf.writestr("下载清单.txt", manifest.encode('utf-8'))
+        
+        download_msg = f"✅ 已打包 {len(valid_files)} 个选中文件，总大小 {round(total_size, 1)}MB"
+        return zip_path, download_msg
+        
+    except Exception as e:
+        return None, f"❌ 选择下载失败: {str(e)}"
+
 def delete_storage_file(filename):
     """从储存空间删除文件"""
     try:
@@ -126,20 +214,10 @@ def clear_storage():
 def ffmpeg_cut_video(input_path, start_time, duration, output_path):
     """稳定的视频切割"""
     command = [
-        'ffmpeg',
-        '-i', input_path,
-        '-ss', str(start_time),
-        '-t', str(duration),
-        '-c:v', 'libx264',
-        '-preset', 'medium',
-        '-crf', '23',
-        '-c:a', 'aac',
-        '-b:a', '128k',
-        '-avoid_negative_ts', 'make_zero',
-        '-y',
-        output_path
+        'ffmpeg', '-i', input_path, '-ss', str(start_time), '-t', str(duration),
+        '-c:v', 'libx264', '-preset', 'medium', '-crf', '23',
+        '-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)
 
@@ -151,17 +229,9 @@ def ffmpeg_resize_video(input_path, output_path, target_ratio):
         filter_complex = "scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2:black"
     
     command = [
-        'ffmpeg',
-        '-i', input_path,
-        '-vf', filter_complex,
-        '-c:v', 'libx264',
-        '-preset', 'medium',
-        '-crf', '23',
-        '-c:a', 'copy',
-        '-y',
-        output_path
+        'ffmpeg', '-i', input_path, '-vf', filter_complex,
+        '-c:v', 'libx264', '-preset', 'medium', '-crf', '23', '-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)
 
@@ -181,19 +251,9 @@ def concat_videos(file_list, output_path):
             list_file.write(f"file '{abs_path}'\n")
         list_file.close()
         
-        command = [
-            'ffmpeg',
-            '-f', 'concat',
-            '-safe', '0',
-            '-i', list_file.name,
-            '-c', 'copy',
-            '-y',
-            output_path
-        ]
-        
+        command = ['ffmpeg', '-f', 'concat', '-safe', '0', '-i', list_file.name, '-c', 'copy', '-y', output_path]
         result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         return result.returncode == 0 and os.path.exists(output_path)
-        
     finally:
         try:
             os.unlink(list_file.name)
@@ -210,17 +270,11 @@ 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
-                ]
+                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:
@@ -241,13 +295,11 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
         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 = []
         
-        # 生成混剪视频
         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)
@@ -256,19 +308,15 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
             if not selected_clips:
                 continue
             
-            # 合并片段
             temp_merged = os.path.join(temp_dir, f"merged_{i+1}.mp4")
             if not concat_videos(selected_clips, temp_merged):
                 continue
             
-            # 调整比例
             timestamp = datetime.now().strftime('%H%M%S')
             final_output = os.path.join(temp_dir, f"混剪视频_{target_ratio.replace(':', 'x')}_{i+1}_{timestamp}.mp4")
             
             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))
@@ -276,7 +324,6 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
         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")
@@ -305,13 +352,8 @@ def process_videos_with_storage(video_files, clip_duration, num_output_videos, t
 所有视频已自动保存到本地储存空间:
 {', '.join(stored_files)}
 
-## 📱 使用说明
-视���已按 {target_ratio} 比例优化，可直接发布到相应平台。
-
----
-FFmpeg 自动混剪工具制作
+视频已按 {target_ratio} 比例优化，可直接发布。
 """
-            
             zipf.writestr("README.txt", readme.encode('utf-8'))
         
         total_size = os.path.getsize(zip_path) / (1024 * 1024)
@@ -347,7 +389,6 @@ FFmpeg 自动混剪工具制作
         for i, stored_file in enumerate(stored_files, 1):
             details += f"• 已储存: {stored_file}\n"
         
-        # 获取最新储存信息
         config, video_list = get_storage_info()
         storage_info = f"""📊 **储存空间状态:**
 
@@ -358,7 +399,7 @@ FFmpeg 自动混剪工具制作
 📋 **最新文件:**
 """
         
-        for video in video_list[:5]:  # 只显示最新5个
+        for video in video_list[:5]:
             storage_info += f"• {video['name']} ({video['size_mb']}MB) - {video['modified']}\n"
         
         return success_msg, zip_path, details, storage_info
@@ -389,36 +430,46 @@ def refresh_storage_display():
     else:
         storage_display += "暂无文件\n"
     
-    # 生成文件选择列表
     file_choices = [video['name'] for video in video_list]
     
-    return storage_display, gr.Dropdown(choices=file_choices, label="选择要删除的文件", interactive=True)
+    return (storage_display, 
+            gr.Dropdown(choices=file_choices, label="选择要删除的文件", interactive=True),
+            gr.CheckboxGroup(choices=file_choices, label="选择要下载的文件", interactive=True))
 
 def handle_delete_file(filename):
     """处理文件删除"""
     if not filename:
-        return "⚠️ 请选择要删除的文件", refresh_storage_display()[0], refresh_storage_display()[1]
+        return "⚠️ 请选择要删除的文件", refresh_storage_display()[0], refresh_storage_display()[1], refresh_storage_display()[2]
     
     result = delete_storage_file(filename)
-    new_display, new_dropdown = refresh_storage_display()
-    return result, new_display, new_dropdown
+    new_display, new_dropdown, new_checkbox = refresh_storage_display()
+    return result, new_display, new_dropdown, new_checkbox
 
 def handle_clear_storage():
     """处理清空储存"""
     result = clear_storage()
-    new_display, new_dropdown = refresh_storage_display()
-    return result, new_display, new_dropdown
+    new_display, new_dropdown, new_checkbox = refresh_storage_display()
+    return result, new_display, new_dropdown, new_checkbox
+
+def handle_download_all():
+    """处理一键下载所有"""
+    zip_file, message = download_all_storage()
+    return zip_file, message
+
+def handle_download_selected(selected_files):
+    """处理选择下载"""
+    zip_file, message = download_selected_storage(selected_files)
+    return zip_file, message
 
-# 初始化储存空间
 init_storage()
 
 def main():
-    with gr.Blocks(title="FFmpeg混剪+储存管理", theme=gr.themes.Soft()) as demo:
+    with gr.Blocks(title="FFmpeg混剪+储存+下载管理", theme=gr.themes.Soft()) as demo:
         
         gr.HTML("""
         <div style="text-align: center; padding: 20px; background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); border-radius: 15px; color: white; margin-bottom: 20px;">
-            <h1>🎬 FFmpeg 混剪工具 + 储存管理</h1>
-            <p style="margin: 10px 0 0 0;">长视频切片 → 智能混剪 → 比例调整 → 自动储存 → 永久保存</p>
+            <h1>🎬 FFmpeg 混剪工具 + 储存管理 + 一键下载</h1>
+            <p style="margin: 10px 0 0 0;">长视频切片 → 智能混剪 → 比例调整 → 自动储存 → 一键下载</p>
         </div>
         """)
         
@@ -435,18 +486,8 @@ def main():
                         )
                         
                         with gr.Row():
-                            clip_duration = gr.Number(
-                                value=3, 
-                                label="切片时长(秒)", 
-                                minimum=1, 
-                                maximum=3600
-                            )
-                            num_output = gr.Number(
-                                value=3, 
-                                label="生成数量", 
-                                minimum=1, 
-                                maximum=100
-                            )
+                            clip_duration = gr.Number(value=3, label="切片时长(秒)", minimum=1, maximum=3600)
+                            num_output = gr.Number(value=3, label="生成数量", minimum=1, maximum=100)
                         
                         ratio_selection = gr.Radio(
                             choices=["9:16", "16:9"], 
@@ -458,32 +499,20 @@ def main():
                         process_btn = gr.Button("🎬 开始混剪并储存", variant="primary", size="lg")
                     
                     with gr.Column(scale=1):
-                        status_output = gr.Textbox(
-                            label="📊 处理状态", 
-                            lines=12, 
-                            interactive=False
-                        )
+                        status_output = gr.Textbox(label="📊 处理状态", lines=12, interactive=False)
                 
                 with gr.Row():
                     with gr.Column():
                         download_file = gr.File(label="📦 下载混剪视频包", interactive=False)
                     
                     with gr.Column():
-                        details_output = gr.Textbox(
-                            label="📝 处理详情", 
-                            lines=12, 
-                            interactive=False
-                        )
+                        details_output = gr.Textbox(label="📝 处理详情", lines=12, interactive=False)
                     
                     with gr.Column():
-                        storage_status = gr.Textbox(
-                            label="💾 储存状态", 
-                            lines=12, 
-                            interactive=False
-                        )
+                        storage_status = gr.Textbox(label="💾 储存状态", lines=12, interactive=False)
             
             # 第二个标签页：储存管理
-            with gr.TabItem("💾 储存管理"):
+            with gr.TabItem("💾 储存管理 + 下载"):
                 with gr.Row():
                     with gr.Column(scale=2):
                         storage_display = gr.Textbox(
@@ -496,23 +525,29 @@ def main():
                     with gr.Column(scale=1):
                         refresh_btn = gr.Button("🔄 刷新储存状态", variant="secondary")
                         
-                        gr.Markdown("### 🗑️ 文件管理")
+                        gr.Markdown("### ⬇️ 下载管理")
+                        
+                        download_all_btn = gr.Button("📦 一键下载全部", variant="primary")
                         
-                        file_selector = gr.Dropdown(
+                        file_selector_download = gr.CheckboxGroup(
                             choices=[], 
-                            label="选择文件", 
+                            label="选择要下载的文件", 
                             interactive=True
                         )
                         
+                        download_selected_btn = gr.Button("📥 下载选中文件", variant="secondary")
+                        
+                        storage_download_file = gr.File(label="📦 储存空间下载", interactive=False)
+                        
+                        gr.Markdown("### 🗑️ 文件管理")
+                        
+                        file_selector = gr.Dropdown(choices=[], label="选择文件", interactive=True)
+                        
                         with gr.Row():
                             delete_btn = gr.Button("🗑️ 删除文件", variant="secondary")
                             clear_btn = gr.Button("🧹 清空储存", variant="stop")
                         
-                        operation_result = gr.Textbox(
-                            label="操作结果", 
-                            lines=3, 
-                            interactive=False
-                        )
+                        operation_result = gr.Textbox(label="操作结果", lines=4, interactive=False)
         
         # 事件绑定
         process_btn.click(
@@ -523,24 +558,35 @@ def main():
         
         refresh_btn.click(
             fn=refresh_storage_display,
-            outputs=[storage_display, file_selector]
+            outputs=[storage_display, file_selector, file_selector_download]
+        )
+        
+        download_all_btn.click(
+            fn=handle_download_all,
+            outputs=[storage_download_file, operation_result]
+        )
+        
+        download_selected_btn.click(
+            fn=handle_download_selected,
+            inputs=[file_selector_download],
+            outputs=[storage_download_file, operation_result]
         )
         
         delete_btn.click(
             fn=handle_delete_file,
             inputs=[file_selector],
-            outputs=[operation_result, storage_display, file_selector]
+            outputs=[operation_result, storage_display, file_selector, file_selector_download]
         )
         
         clear_btn.click(
             fn=handle_clear_storage,
-            outputs=[operation_result, storage_display, file_selector]
+            outputs=[operation_result, storage_display, file_selector, file_selector_download]
         )
         
-        # 页面加载时自动刷新储存显示
+        # 页面加载时自动刷新
         demo.load(
             fn=refresh_storage_display,
-            outputs=[storage_display, file_selector]
+            outputs=[storage_display, file_selector, file_selector_download]
         )
         
         gr.Markdown("""
@@ -556,20 +602,31 @@ def main():
         **💾 储存管理功能:**
         - 📁 所有生成视频自动保存�� `~/video_storage/`
         - 🔄 实时查看储存空间使用情况
+        - 📊 显示文件详细信息（大小、时间）
+        
+        **⬇️ 一键下载功能:**
+        - 📦 **一键下载全部**: 打包下载储存空间中所有视频
+        - 📥 **选择下载**: 勾选特定文件进行批量下载
+        - 🗂️ **自动清单**: 下载包含详细文件清单
+        - ⚡ **快速打包**: 自动压缩，节省下载时间
+        
+        **🗑️ 文件管理功能:**
         - 🗑️ 支持单个文件删除
         - 🧹 支持清空全部储存文件
-        - 📊 显示文件详细信息（大小、时间）
+        - 📱 灵活的文件管理操作
         
-        **🔥 储存优势:**
-        - ✅ **永久保存**: 文件不会因临时目录清理而丢失
-        - 🚀 **快速访问**: 本地储存，无需重新下载
-        - 📱 **灵活管理**: 随时查看、删除不需要的文件
-        - 💾 **空间监控**: 实时显示储存使用情况
+        **🔥 使用场景:**
+        - **批量备份**: 一键下载所有混剪作品
+        - **选择性导出**: 只下载需要的特定视频
+        - **移动设备**: 下载到手机/平板继续编辑
+        - **分享协作**: 打包分享给团队成员
+        - **存档管理**: 定期下载备份到云盘
         
         **⚠️ 注意事项:**
-        - 储存目录位于用户主目录下的 `video_storage` 文件夹
-        - 请定期清理不需要的文件以节省磁盘空间
-        - 删除操作不可恢复，请谨慎操作
+        - 下载文件为ZIP格式，需要解压使用
+        - 一键下载包含储存空间中所有视频文件
+        - 选择下载可以精确控制需要的文件
+        - 下载包自动包含详细的文件清单
         """)
     
     demo.launch()