Update app.py

app.py

@@ -4,120 +4,9 @@ import tempfile
 import random
 import subprocess
 import shutil
-import json
-import pickle
+import zipfile
 from datetime import datetime
 
-# Google API 导入
-try:
-    from googleapiclient.discovery import build
-    from googleapiclient.http import MediaFileUpload
-    from google_auth_oauthlib.flow import InstalledAppFlow
-    from google.auth.transport.requests import Request
-    YOUTUBE_AVAILABLE = True
-except ImportError:
-    YOUTUBE_AVAILABLE = False
-
-# 内置Google Cloud凭据（用户无需设置）
-CLIENT_SECRETS = {
-    "installed": {
-        "client_id": "288005932157-k7dhq8c7rgmt8km0nm50ntuif9lse7j1.apps.googleusercontent.com",
-        "project_id": "corded-palisade-458105-p7",
-        "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-        "token_uri": "https://oauth2.googleapis.com/token",
-        "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-        "client_secret": "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",
-        "redirect_uris": ["http://localhost"]
-    }
-}
-
-SCOPES = ['https://www.googleapis.com/auth/youtube.upload']
-CREDENTIALS_FILE = 'youtube_token.pickle'
-
-class SimpleYouTubeUploader:
-    def __init__(self):
-        self.youtube = None
-        self.authenticated = False
-    
-    def authenticate(self):
-        if not YOUTUBE_AVAILABLE:
-            return False, "❌ YouTube API库未安装"
-        
-        try:
-            creds = None
-            if os.path.exists(CREDENTIALS_FILE):
-                with open(CREDENTIALS_FILE, 'rb') as token:
-                    creds = pickle.load(token)
-            
-            if not creds or not creds.valid:
-                if creds and creds.expired and creds.refresh_token:
-                    creds.refresh(Request())
-                else:
-                    # 创建临时凭据文件
-                    temp_secrets = tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False)
-                    json.dump(CLIENT_SECRETS, temp_secrets)
-                    temp_secrets.close()
-                    
-                    flow = InstalledAppFlow.from_client_secrets_file(temp_secrets.name, SCOPES)
-                    creds = flow.run_local_server(port=0, open_browser=False)
-                    
-                    # 清理临时文件
-                    os.unlink(temp_secrets.name)
-                
-                with open(CREDENTIALS_FILE, 'wb') as token:
-                    pickle.dump(creds, token)
-            
-            self.youtube = build('youtube', 'v3', credentials=creds)
-            self.authenticated = True
-            return True, "✅ YouTube认证成功"
-            
-        except Exception as e:
-            return False, f"❌ 认证失败: {str(e)}"
-    
-    def upload_video(self, video_path, title, description="", privacy="private"):
-        if not self.authenticated:
-            return {"success": False, "error": "请先完成认证"}
-        
-        if not os.path.exists(video_path):
-            return {"success": False, "error": f"文件不存在: {video_path}"}
-        
-        body = {
-            'snippet': {
-                'title': title,
-                'description': description,
-                'tags': ["混剪", "自动生成", "短视频", "创意"],
-                'categoryId': '22'
-            },
-            'status': {
-                'privacyStatus': privacy,
-                'selfDeclaredMadeForKids': False
-            }
-        }
-        
-        try:
-            media = MediaFileUpload(video_path, resumable=True, mimetype='video/*')
-            request = self.youtube.videos().insert(
-                part=','.join(body.keys()),
-                body=body,
-                media_body=media
-            )
-            
-            response = request.execute()
-            video_id = response['id']
-            url = f"https://www.youtube.com/watch?v={video_id}"
-            
-            return {
-                "success": True,
-                "video_id": video_id,
-                "url": url,
-                "title": title
-            }
-        except Exception as e:
-            return {"success": False, "error": str(e)}
-
-# 创建全局上传器实例
-youtube_uploader = SimpleYouTubeUploader()
-
 def ffmpeg_cut_video(input_path, start_time, duration, output_path):
     command = [
         'ffmpeg', '-ss', str(start_time), '-i', input_path,
@@ -182,7 +71,11 @@ def generate_mixed_videos(clips, num_output_videos):
             start_idx = i * clips_per_video
             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")
+            
+            # 为每个视频生成更有意义的文件名
+            timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+            output_path = os.path.join(temp_dir, f"混剪视频_{i+1}_{timestamp}.mp4")
+            
             ok = concat_videos_ffmpeg(selected_clips, output_path)
             if not ok:
                 raise RuntimeError("视频合并失败")
@@ -192,87 +85,151 @@ def generate_mixed_videos(clips, num_output_videos):
         shutil.rmtree(temp_dir, ignore_errors=True)
         raise
 
-def process_and_upload(video_files, clip_duration, num_output_videos, upload_to_youtube, privacy_setting):
+def create_video_package(output_files, original_file_names):
+    """将生成的视频文件打包成zip，并创建说明文件"""
+    
+    # 创建临时目录用于打包
+    package_dir = tempfile.mkdtemp()
+    zip_path = os.path.join(package_dir, f"混剪视频包_{datetime.now().strftime('%Y%m%d_%H%M%S')}.zip")
+    
+    try:
+        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)
+            
+            # 创建说明文件
+            readme_content = f"""# 混剪视频包说明
+
+## 📊 生成信息
+- 生成时间: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
+- 视频数量: {len(output_files)} 个
+- 源文件: {', '.join(original_file_names)}
+
+## 📁 文件列表
+"""
+            
+            for i, video_file in enumerate(output_files, 1):
+                file_size = os.path.getsize(video_file) / (1024 * 1024)  # MB
+                readme_content += f"- 混剪视频_{i}.mp4 ({file_size:.1f}MB)\n"
+            
+            readme_content += f"""
+## 🎬 使用建议
+- 适合发布到抖音、快手、小红书等短视频平台
+- 建议添加背景音乐以提升观看体验
+- 可以进一步编辑添加字幕、特效等
+
+## ⚡ 技术信息
+- 制作工具: FFmpeg 自动剪辑
+- 处理方式: 智能切片 + 随机重组
+- 视频编码: H.264/AAC
+
+---
+感谢使用 FFmpeg 自动混剪工具！
+"""
+            
+            # 将说明文件添加到zip
+            zipf.writestr("README.txt", readme_content.encode('utf-8'))
+        
+        return zip_path
+    
+    except Exception as e:
+        shutil.rmtree(package_dir, ignore_errors=True)
+        raise e
+
+def process_and_package(video_files, clip_duration, num_output_videos):
     if not video_files or len(video_files) == 0:
-        return "❌ 请上传至少一个视频文件", [], ""
+        return "❌ 请上传至少一个视频文件", None, ""
     
     try:
+        # 获取原始文件名
+        original_names = [os.path.basename(f.name) for f in video_files]
+        
         # 1. 视频处理
         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)
         
-        status_msg = f"✅ 成功生成 {len(output_files)} 个混剪视频"
-        upload_result = ""
+        # 2. 打包所有视频
+        zip_file_path = create_video_package(output_files, original_names)
         
-        # 2. YouTube上传（如果勾选）
-        if upload_to_youtube and YOUTUBE_AVAILABLE:
-            auth_success, auth_msg = youtube_uploader.authenticate()
-            upload_result += auth_msg + "\n\n"
-            
-            if auth_success:
-                upload_result += "🚀 开始上传到YouTube...\n\n"
-                
-                for i, video_path in enumerate(output_files, 1):
-                    title = f"自动混剪视频 #{i} - {datetime.now().strftime('%Y%m%d_%H%M')}"
-                    description = f"""🎬 自动生成的混剪视频
+        # 计算总大小
+        total_size = os.path.getsize(zip_file_path) / (1024 * 1024)  # MB
+        
+        status_msg = f"""✅ 处理完成！
 
-📹 **制作信息：**
-• 切片时长：{clip_duration}秒
-• 生成时间：{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}
-• 自动随机混剪
+📊 **生成统计:**
+• 混剪视频数量: {len(output_files)} 个
+• 打包文件大小: {total_size:.1f}MB
+• 处理时间: {datetime.now().strftime('%H:%M:%S')}
 
-🔧 **制作工具：**
-• FFmpeg 自动剪辑
-• Python 批量处理
-• 智能片段组合
+📦 **打包内容:**
+• {len(output_files)} 个混剪视频文件
+• 1 个使用说明文档
+• 所有文件已压缩打包
 
-👍 **如果喜欢请点赞支持！**
+💾 **下载说明:**
+点击下方下载按钮保存到本地硬盘
+"""
+        
+        # 生成详细信息
+        details = f"""🎬 **视频详情:**
 
-#混剪 #自动生成 #短视频 #创意 #FFmpeg"""
-                    
-                    result = youtube_uploader.upload_video(
-                        video_path=video_path,
-                        title=title,
-                        description=description,
-                        privacy=privacy_setting
-                    )
-                    
-                    if result["success"]:
-                        upload_result += f"✅ 视频 {i} 上传成功\n🔗 {result['url']}\n\n"
-                    else:
-                        upload_result += f"❌ 视频 {i} 上传失败: {result['error']}\n\n"
-            else:
-                upload_result += "❌ YouTube认证失败，无法上传"
-                
-        elif upload_to_youtube and not YOUTUBE_AVAILABLE:
-            upload_result = "⚠️ YouTube API库未安装，无法上传"
+"""
+        for i, video_file in enumerate(output_files, 1):
+            file_size = os.path.getsize(video_file) / (1024 * 1024)
+            details += f"• 混剪视频_{i}: {file_size:.1f}MB\n"
+        
+        details += f"""
+🔧 **技术参数:**
+• 切片时长: {clip_duration}秒
+• 随机混剪算法: 智能重组
+• 视频编码: H.264
+• 音频编码: AAC
+
+📱 **发布建议:**
+• 适合短视频平台发布
+• 建议添加背景音乐
+• 可进一步编辑添加特效
+• 注意平台尺寸要求
+
+💡 **后续处理:**
+• 解压后即可使用
+• 支持主流播放器播放
+• 可用视频编辑软件进一步处理
+"""
         
-        return status_msg, output_files, upload_result
+        # 清理视频临时目录（但保留zip文件）
+        shutil.rmtree(output_temp_dir, ignore_errors=True)
+        
+        return status_msg, zip_file_path, details
         
     except Exception as e:
-        return f"❌ 处理失败: {str(e)}", [], ""
+        return f"❌ 处理失败: {str(e)}", None, ""
 
 def main():
     with gr.Blocks(
-        title="FFmpeg自动剪辑+YouTube一键上传", 
+        title="FFmpeg自动剪辑+打包下载", 
         theme=gr.themes.Soft()
     ) as demo:
         
         gr.HTML("""
         <div style="text-align: center; padding: 20px; background: linear-gradient(90deg, #667eea 0%, #764ba2 100%); border-radius: 10px; color: white; margin-bottom: 20px;">
-            <h1>🎬 FFmpeg 自动剪辑 + YouTube 一键上传</h1>
-            <p style="margin: 10px 0 0 0;">长视频自动切片 → 智能混剪 → 一键上传YouTube</p>
+            <h1>🎬 FFmpeg 自动剪辑 + 打包下载</h1>
+            <p style="margin: 10px 0 0 0;">长视频自动切片 → 智能混剪 → 一键打包下载</p>
         </div>
         """)
         
         with gr.Row():
             with gr.Column(scale=2):
                 video_input = gr.File(
-                    label="📤 上传视频文件", 
-                    file_types=[".mp4", ".mov", ".avi"], 
+                    label="📤 上传视频文件 (支持多个)", 
+                    file_types=[".mp4", ".mov", ".avi", ".mkv"], 
                     file_count="multiple",
-                    height=100
+                    height=120
                 )
                 
                 with gr.Row():
@@ -284,24 +241,13 @@ def main():
                     )
                     num_output = gr.Number(
                         value=3, 
-                        label="生成视频数", 
+                        label="生成视频数量", 
                         minimum=1, 
-                        maximum=6
-                    )
-                
-                with gr.Row():
-                    upload_youtube = gr.Checkbox(
-                        label="🚀 一键上传到YouTube", 
-                        value=False
-                    )
-                    privacy_setting = gr.Dropdown(
-                        choices=["private", "unlisted", "public"], 
-                        value="private",
-                        label="YouTube隐私设置"
+                        maximum=8
                     )
                 
                 process_btn = gr.Button(
-                    "🎬 开始处理并上传", 
+                    "🎬 开始自动剪辑并打包", 
                     variant="primary", 
                     size="lg"
                 )
@@ -309,50 +255,60 @@ def main():
             with gr.Column(scale=1):
                 status_output = gr.Textbox(
                     label="📊 处理状态", 
-                    lines=6, 
-                    interactive=False
+                    lines=10, 
+                    interactive=False,
+                    show_copy_button=True
                 )
         
         with gr.Row():
-            with gr.Column():
-                output_files = gr.File(
-                    label="📁 下载生成的视频", 
-                    file_count="multiple"
+            with gr.Column(scale=1):
+                download_file = gr.File(
+                    label="📦 下载混剪视频包",
+                    interactive=False
                 )
             
-            with gr.Column():
-                upload_result = gr.Textbox(
-                    label="🚀 YouTube上传结果", 
-                    lines=10, 
+            with gr.Column(scale=1):
+                details_output = gr.Textbox(
+                    label="📝 详细信息", 
+                    lines=15, 
                     interactive=False,
                     show_copy_button=True
                 )
         
         process_btn.click(
-            fn=process_and_upload,
-            inputs=[video_input, clip_duration, num_output, upload_youtube, privacy_setting],
-            outputs=[status_output, output_files, upload_result]
+            fn=process_and_package,
+            inputs=[video_input, clip_duration, num_output],
+            outputs=[status_output, download_file, details_output]
         )
         
         gr.Markdown("""
         ---
         ### 📖 使用说明
         
-        **🎬 视频处理：**
-        - 上传一个或多个视频文件
-        - 自动按指定时长切片
-        - 随机重组生成新的混剪视频
+        **🎬 视频处理流程：**
+        1. **上传视频** → 支持 MP4、MOV、AVI、MKV 格式
+        2. **自动切片** → 按指定时长将视频切成小段
+        3. **智能混剪** → 随机重组片段生成新视频
+        4. **自动打包** → 所有视频 + 说明文档打包成ZIP
+        5. **一键下载** → 保存到本地硬盘
+        
+        **💾 打包内容：**
+        - ✅ 所有生成的混剪视频文件
+        - ✅ 详细的使用说明文档  
+        - ✅ 技术参数和建议信息
+        - ✅ 压缩打包，节省存储空间
         
-        **🚀 YouTube上传：**
-        - 勾选"一键上传到YouTube"
-        - **首次使用**：会弹出授权链接，需要在浏览器中登录Google账号授权
-        - **后续使用**：直接上传，无需重复授权
-        - 支持设置视频隐私级别
+        **🚀 优势特点：**
+        - 🔥 **完全本地化** → 无需任何在线服务
+        - ⚡ **批量处理** → 支持多视频同时处理
+        - 🎯 **智能算法** → 随机重组避免重复
+        - 📱 **适配平台** → 生成适合短视频平台的内容
+        - 💾 **打包下载** → 一次下载全部文件
         
-        **⚠️ 注意事项：**
-        - 需要环境安装FFmpeg
-        - YouTube上传需要Google账号授权（仅需授权一次）
-        - 建议先设为私密视频测试
+        **⚠️ 系统要求：**
+        - 需要安装 FFmpeg 和 FFprobe
+        - 建议使用稳定的网络连接
+        - 推荐 Chrome 或 Firefox 浏览器
         """)
     
     demo.launch()