Upload app.py

app.py

@@ -104,26 +104,50 @@ def get_audio_duration(audio_path):
         logger.error(f"Error getting audio duration: {e}")
         return 5.0  # 默认5秒
 
+# 在生成ASS文件时添加完整样式头
+ASS_STYLE_HEADER = """[Script Info]
+WrapStyle: 0
+ScaledBorderAndShadow: yes
+PlayResX: 1920
+PlayResY: 1080
+[V4+ Styles]
+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+Style: Caption,Noto Sans CJK SC,54,&H00FFFFFF,&H000000FF,&H00333333,&H00000000,0,0,0,0,100,100,0,0,1,2,3,2,100,100,50,0
+Style: Speech,Noto Sans CJK SC,48,&H00FFFFFF,&H000000FF,&H00333333,&H00000000,0,0,0,0,100,100,0,0,1,2,3,8,100,100,50,0
+[Events]
+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+"""
+def smart_wrap(text, video_width=1920):
+    """智能换行算法"""
+    max_chars = int(video_width // 38)  # 基于典型字体尺寸计算
+    lines = []
+    current_line = []
+    current_len = 0
+    
+    for char in text:
+        char_len = 2 if ord(char) > 255 else 1  # 全角字符计为2单位
+        if current_len + char_len > max_chars * 2:
+            lines.append(''.join(current_line))
+            current_line = [char]
+            current_len = char_len
+        else:
+            current_line.append(char)
+            current_len += char_len
+    lines.append(''.join(current_line))
+    
+    return r'\N'.join(lines)
+
 # 创建caption字幕文件（底部显示）
 def create_caption_subtitle_file(project_dir, captions, panel_start_times, panel_durations):
     try:
-        subtitle_file = os.path.join(project_dir, "captions.ass")
-        
         with open(subtitle_file, "w", encoding="utf-8") as f:
-            subtitle_index = 1
-            
-            # 处理每个面板的旁白字幕
-            for i, caption in enumerate(captions):
-                # 获取当前面板的开始时间和持续时间
-                start_time = panel_start_times[i]
-                duration = panel_durations[i]
-                end_time = start_time + duration
-                
-                # 字幕显示整个面板的时长
-                f.write(f"{subtitle_index}\n")
-                f.write(f"{format_time(start_time)} --> {format_time(end_time)}\n")
-                f.write(f"{caption}\n\n")
-                subtitle_index += 1
+            f.write(ASS_STYLE_HEADER)
+            for i, (caption, start, duration) in enumerate(zip(captions, panel_start_times, panel_durations)):
+                wrapped_text = smart_wrap(caption)
+                f.write(
+                    f"Dialogue: 0,{format_time(start)},{format_time(start + duration)},"
+                    f"Caption,,0,0,0,,{wrapped_text}\n"
+                )
         
         return subtitle_file
     except Exception as e:
@@ -133,23 +157,14 @@ def create_caption_subtitle_file(project_dir, captions, panel_start_times, panel
 # 创建speech字幕文件（顶部显示）
 def create_speech_subtitle_file(project_dir, speeches, panel_start_times, panel_durations):
     try:
-        subtitle_file = os.path.join(project_dir, "speeches.ass")
-        
         with open(subtitle_file, "w", encoding="utf-8") as f:
-            subtitle_index = 1
-            
-            # 处理每个面板的对话字幕
-            for i, speech in enumerate(speeches):
-                # 获取当前面板的开始时间和持续时间
-                start_time = panel_start_times[i]
-                duration = panel_durations[i]
-                end_time = start_time + duration
-                
-                # 字幕显示整个面板的时长
-                f.write(f"{subtitle_index}\n")
-                f.write(f"{format_time(start_time)} --> {format_time(end_time)}\n")
-                f.write(f"{speech}\n\n")
-                subtitle_index += 1
+            f.write(ASS_STYLE_HEADER)
+            for i, (speech, start, duration) in enumerate(zip(speeches, panel_start_times, panel_durations)):
+                wrapped_text = smart_wrap(speech)
+                f.write(
+                    f"Dialogue: 0,{format_time(start)},{format_time(start + duration)},"
+                    f"Speech,,0,0,0,,{wrapped_text}\n"
+                )
         
         return subtitle_file
     except Exception as e:
@@ -317,7 +332,7 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
         combined_filter = (
             f"subtitles={process_sub_path(caption_subtitle_file)}:"
             "force_style='"
-            "FontName=Noto Sans CJK SC,"
+            #"FontName=Noto Sans CJK SC,"
             "Fontsize={},"
             "Alignment=2,"
             "MarginV={},"
@@ -327,7 +342,7 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
             ),
             f"subtitles={process_sub_path(speech_subtitle_file)}:"
             "force_style='"
-            "FontName=Noto Sans CJK SC,"
+            #"FontName=Noto Sans CJK SC,"
             "Fontsize={},"
             "Alignment=8,"
             "MarginV={},"