Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
fix: validate subtitle style before ASS rendering
wuliened0287ab5a89
diff --git a/internal/service/srt_embed.go b/internal/service/srt_embed.goindex fa75b2ee..1b9e3679 100644--- a/internal/service/srt_embed.go+++ b/internal/service/srt_embed.go@@ -391,18 +391,21 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.SustyleSet := subtitlestyle.DefaultStyleSet()if stepParam != nil && stepParam.SubtitleStyle != nil {styleSet = stepParam.SubtitleStyle+ if err := subtitlestyle.Validate(styleSet); err != nil {+ return fmt.Errorf("subtitle style invalid: %w", err)+ }}screenStyle := styleSet.Verticalif isHorizontal {screenStyle = styleSet.Horizontal}+ majorTags := subtitlestyle.DialogueTags(screenStyle.Major)+ minorTags := subtitlestyle.DialogueTags(screenStyle.Minor)+ majorAlignment := subtitlestyle.Alignment(screenStyle.Major)+ minorAlignment := subtitlestyle.Alignment(screenStyle.Minor)if isHorizontal {_, _ = assFile.WriteString(subtitlestyle.BuildAssHeader(styleSet, isHorizontal))- majorTags := subtitlestyle.DialogueTags(screenStyle.Major)- minorTags := subtitlestyle.DialogueTags(screenStyle.Minor)- majorAlignment := subtitlestyle.Alignment(screenStyle.Major)- minorAlignment := subtitlestyle.Alignment(screenStyle.Minor)for scanner.Scan() {line := scanner.Text()if line == "" {@@ -513,8 +516,8 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.SustartFormatted := formatTimestamp(iStart)endFormatted := formatTimestamp(iEnd)combinedText := fmt.Sprintf("%s{\\an%d}{\\rMajor}%s",- subtitlestyle.DialogueTags(screenStyle.Major),- subtitlestyle.Alignment(screenStyle.Major),+ majorTags,+ majorAlignment,line)_, _ = assFile.WriteString(fmt.Sprintf("Dialogue: 0,%s,%s,Major,,0,0,0,,%s\n", startFormatted, endFormatted, combinedText))}@@ -524,8 +527,8 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.SuendFormatted := formatTimestamp(endTime)cleanedText := util.CleanPunction(content)combinedText := fmt.Sprintf("%s{\\an%d}{\\rMinor}%s",- subtitlestyle.DialogueTags(screenStyle.Minor),- subtitlestyle.Alignment(screenStyle.Minor),+ minorTags,+ minorAlignment,cleanedText)_, _ = assFile.WriteString(fmt.Sprintf("Dialogue: 0,%s,%s,Minor,,0,0,0,,%s\n", startFormatted, endFormatted, combinedText))}diff --git a/internal/service/srt_embed_test.go b/internal/service/srt_embed_test.goindex 60f60d97..de4e14f2 100644--- a/internal/service/srt_embed_test.go+++ b/internal/service/srt_embed_test.go@@ -178,6 +178,53 @@ func TestVerticalAssUsesCustomMinorStyle(t *testing.T) {}}+func TestSrtToAssRejectsInvalidSubtitleStyle(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "subtitle.srt")+ out := filepath.Join(dir, "subtitle.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\n主字幕\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.PrimaryColor = "not-a-color"++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{+ TaskBasePath: dir,+ SubtitleStyle: style,+ })+ if err == nil {+ t.Fatal("srtToAss() error = nil, want invalid subtitle style error")+ }+ if !strings.Contains(err.Error(), "subtitle style") && !strings.Contains(err.Error(), "horizontal.major.primary_color") {+ t.Fatalf("srtToAss() error = %q, want subtitle style context", err.Error())+ }+}++func TestSrtToAssDefaultHeaderUsesStyleDefaults(t *testing.T) {+ dir := t.TempDir()+ in := filepath.Join(dir, "subtitle.srt")+ out := filepath.Join(dir, "subtitle.ass")+ content := "1\n00:00:00,840 --> 00:00:02,900\n主字幕\n\n"+ if err := os.WriteFile(in, []byte(content), 0644); err != nil {+ t.Fatal(err)+ }++ err := srtToAss(in, out, true, &types.SubtitleTaskStepParam{TaskBasePath: dir})+ if err != nil {+ t.Fatalf("srtToAss() error = %v", err)+ }+ data, err := os.ReadFile(out)+ if err != nil {+ t.Fatal(err)+ }+ ass := string(data)+ if !strings.Contains(ass, "Style: Major,Arial,14,&H0000BFFF") {+ t.Fatalf("default Major style missing:\n%s", ass)+ }+}+func subtitleDisplayWidth(text string) int {width := 0for _, r := range text {