Update app.py

app.py

@@ -1,6 +1,8 @@
 import os
 import gradio as gr
 import tempfile
+import random
+import shutil
 from datetime import datetime
 
 try:
@@ -37,7 +39,7 @@ class YouTubeUploader:
         self.client_secrets_file = 'client_secrets.json'
         self.credentials_file = 'youtube_token.pickle'
         self.youtube = None
-    
+
     def authenticate(self):
         creds = None
         if os.path.exists(self.credentials_file):
@@ -50,16 +52,17 @@ class YouTubeUploader:
                 flow = InstalledAppFlow.from_client_secrets_file(
                     self.client_secrets_file, self.SCOPES
                 )
-                creds = flow.run_console()
+                creds = flow.run_local_server(port=0, open_browser=False)
+                print("请复制下面的链接到浏览器打开并完成授权")
             with open(self.credentials_file, 'wb') as token:
                 pickle.dump(creds, token)
         self.youtube = build('youtube', 'v3', credentials=creds)
         return True
-    
+
     def upload_video(self, video_path, title, description="", tags="", privacy="private"):
         if not os.path.exists(video_path):
             return {"success": False, "error": f"视频文件 {video_path} 不存在"}
-        
+
         body = {
             "snippet": {
                 "title": title,
@@ -72,10 +75,10 @@ class YouTubeUploader:
                 "selfDeclaredMadeForKids": False
             }
         }
-        
+
         media = MediaFileUpload(video_path, chunksize=-1, resumable=True, mimetype="video/*")
         request = self.youtube.videos().insert(part=",".join(body.keys()), body=body, media_body=media)
-        
+
         response = request.execute()
         video_id = response.get("id")
         url = f"https://www.youtube.com/watch?v={video_id}"
@@ -101,27 +104,68 @@ def process_videos(video_files, audio_file, clip_duration, num_output):
     ok, msg = check_filesize(video_files, audio_file)
     if not ok:
         return msg, [], ""
-    
-    # 真实视频切片、混剪应在这里实现
-    # 本处仅返回成功信息，结合你已有处理逻辑即可
-    return f"成功处理 {len(video_files)} 个视频，生成 {num_output} 个混剪视频", [], ""
+
+    out_files = []
+    try:
+        clips = []
+        for video in video_files:
+            clip = VideoFileClip(video.name)
+            duration = clip.duration
+
+            for start in range(0, int(duration), int(clip_duration)):
+                end = min(start + clip_duration, duration)
+                subclip = clip.subclip(start, end).without_audio()
+                clips.append(subclip)
+
+        random.shuffle(clips)
+
+        clips_per_video = max(1, len(clips) // num_output)
+        output_dir = tempfile.mkdtemp()
+
+        for i in range(num_output):
+            start_idx = i * clips_per_video
+            end_idx = len(clips) if i == num_output - 1 else (start_idx + clips_per_video)
+            selected_clips = clips[start_idx:end_idx]
+            if not selected_clips:
+                continue
+
+            final_clip = concatenate_videoclips(selected_clips)
+
+            if audio_file:
+                audio_clip = AudioFileClip(audio_file.name)
+                min_duration = min(final_clip.duration, audio_clip.duration)
+                final_clip = final_clip.subclip(0, min_duration)
+                audio_clip = audio_clip.subclip(0, min_duration)
+                final_clip = final_clip.set_audio(audio_clip)
+
+            output_path = os.path.join(output_dir, f"mixcut_{i+1}.mp4")
+            final_clip.write_videofile(output_path, codec="libx264", audio_codec="aac", verbose=False, logger=None)
+            out_files.append(output_path)
+            final_clip.close()
+
+        shutil.rmtree(output_dir, ignore_errors=True)  # 可选，处理完删除临时文件
+
+        return f"成功生成 {len(out_files)} 个混剪视频", out_files, output_dir
+
+    except Exception as e:
+        return f"❌ 视频处理出错: {str(e)}", [], ""
 
 def generate_ai_analysis(video_count, file_names):
     if not OPENAI_AVAILABLE or video_count == 0:
-        return "⚠️ AI 分析暂不可用或无视频文件。"
+        return "⚠️ 无视频文件或 AI 配置不可用。"
     try:
         file_info = ", ".join([f"'{name}'" for name in file_names[:3]])
-        prompt = f"""作为专业视频分析师，基于用户上传的 {video_count} 个视频文件（文件名包括：{file_info} 等），请提供详细分析：
-1. 内容类型推测和特点
-2. 最佳背景音乐风格和节拍
-3. 推荐剪辑策略和转场效果
-4. 目标受众分析
+        prompt = f"""作为专业视频分析师，基于用户上传的 {video_count} 个视频文件（包括：{file_info} 等），请提供分析：
+1. 内容类型推测
+2. 背景音乐建议
+3. 剪辑策略
+4. 目标用户
 
-请用中文回答，格式清晰。"""
+用中文回答，格式清晰。"""
         response = client.chat.completions.create(
             model="gpt-4o-mini",
             messages=[
-                {"role": "system", "content": "你是专业的视频内容分析专家。"},
+                {"role": "system", "content": "你是视频内容专家。"},
                 {"role": "user", "content": prompt}
             ],
             max_tokens=600,
@@ -129,28 +173,27 @@ def generate_ai_analysis(video_count, file_names):
         )
         return response.choices[0].message.content
     except Exception as e:
-        return f"❌ AI 分析失败：{str(e)}"
+        return f"❌ AI 分析失败: {str(e)}"
 
 def main_app(video_files, audio_file, clip_duration, num_output, upload_yt, yt_privacy):
     status, outfiles, _ = process_videos(video_files, audio_file, clip_duration, num_output)
-    
+
     file_names = [os.path.basename(f.name) for f in (video_files or [])]
     ai_analysis = generate_ai_analysis(len(video_files or []), file_names)
-    
+
     yt_result = ""
     if upload_yt:
         if not YOUTUBE_AVAILABLE:
-            yt_result = "⚠️ 未安装 YouTube API 库，上传功能不可用"
+            yt_result = "⚠️ 未安装 YouTube API 库"
         elif not os.path.exists("client_secrets.json"):
-            yt_result = "⚠️ client_secrets.json 文件缺失，无法上传"
+            yt_result = "⚠️ 缺少 client_secrets.json 文件"
         else:
             uploader = YouTubeUploader()
-            authed = uploader.authenticate()
-            if not authed:
-                yt_result = "❌ YouTube 认证失败"
+            if uploader.authenticate():
+                yt_result = "认证成功，上传功能请手动调用上传接口。"
             else:
-                yt_result = "请配合实际生成的视频文件路径调用上传函数"
-    
+                yt_result = "❌ 认证失败"
+
     return status, ai_analysis, yt_result
 
 try:
@@ -160,20 +203,20 @@ except ImportError:
     YOUTUBE_AVAILABLE = False
 
 with gr.Blocks() as demo:
-    gr.Markdown("## pyTovideo2 视频处理＋YouTube 上传 (实用版)")
-    
+    gr.Markdown("## pyTovideo2 完整视频切割混剪 + YouTube上传（需预先配置）")
+
     video_files = gr.File(file_types=[".mp4", ".mov", ".avi"], label="上传视频文件", file_count="multiple")
     audio_file = gr.File(file_types=[".mp3", ".wav", ".m4a"], label="上传音频文件")
     clip_duration = gr.Number(value=2, label="切片时长 (秒)", minimum=1, maximum=10)
     num_output = gr.Number(value=3, label="输出视频数量", minimum=1, maximum=10)
-    upload_yt = gr.Checkbox(label="处理后上传至 YouTube")
-    yt_privacy = gr.Dropdown(choices=["public", "private", "unlisted"], value="private", label="YouTube 视频隐私")
+    upload_yt = gr.Checkbox(label="处理后上传到 YouTube")
+    yt_privacy = gr.Dropdown(choices=["public", "private", "unlisted"], value="private", label="选择 YouTube 视频隐私")
     btn = gr.Button("开始处理")
-    
+
     status_out = gr.Textbox(label="处理状态", lines=4, interactive=False)
     ai_out = gr.Textbox(label="AI 内容分析", lines=12)
-    yt_out = gr.Textbox(label="YouTube 上传结果", lines=6)
-    
+    yt_out = gr.Textbox(label="YouTube 上传状态", lines=6)
+
     btn.click(
         main_app,
         inputs=[video_files, audio_file, clip_duration, num_output, upload_yt, yt_privacy],