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: keep subtitle style files in CLI layer
wulien490e6f6ee5de
diff --git a/internal/cli/commands.go b/internal/cli/commands.goindex 559c2580..0d00f41c 100644--- a/internal/cli/commands.go+++ b/internal/cli/commands.go@@ -41,14 +41,15 @@ func defaultStyleLoadError(err error) error {}type Command struct {- Name string- Help bool- DryRun bool- Subtitle pipeline.SubtitleRequest- TTS pipeline.TTSRequest- Render pipeline.RenderRequest- Cover pipeline.CoverRequest- Pipeline pipeline.PipelineRequest+ Name string+ Help bool+ DryRun bool+ SubtitleStyleFile string+ Subtitle pipeline.SubtitleRequest+ TTS pipeline.TTSRequest+ Render pipeline.RenderRequest+ Cover pipeline.CoverRequest+ Pipeline pipeline.PipelineRequest}func Parse(args []string) (Command, error) {@@ -200,7 +201,7 @@ func Execute(ctx context.Context, svc pipeline.StageService, cmd Command) pipeli}switch cmd.Name {case "subtitle":- style, err := loadSubtitleStyleForCLI(cmd.Subtitle.SubtitleStyleFile)+ style, err := loadSubtitleStyleForCLI(cmd.SubtitleStyleFile)if err != nil {return styleLoadFailure(pipeline.StageSubtitle, cmd.Subtitle.Workdir, cmd.Subtitle.TaskID, err)}@@ -211,7 +212,7 @@ func Execute(ctx context.Context, svc pipeline.StageService, cmd Command) pipeliresp, err := pipeline.GenerateTTS(ctx, svc, cmd.TTS)return responseWithError(resp, err)case "render-horizontal", "render-vertical":- style, err := loadSubtitleStyleForCLI(cmd.Render.SubtitleStyleFile)+ style, err := loadSubtitleStyleForCLI(cmd.SubtitleStyleFile)if err != nil {return styleLoadFailure(renderStageFromCommand(cmd.Name), cmd.Render.Workdir, cmd.Render.TaskID, err)}@@ -292,19 +293,19 @@ func parseSubtitle(name string, args []string) (Command, error) {return Command{}, errors.New("subtitle requires input")}return Command{- Name: name,- DryRun: *dryRun,+ Name: name,+ DryRun: *dryRun,+ SubtitleStyleFile: *subtitleStyleFile,Subtitle: pipeline.SubtitleRequest{- Input: input,- Workdir: *workdir,- TaskID: *taskID,- OriginLang: *originLang,- TargetLang: *targetLang,- UserLang: *userLang,- CaptionSource: pipeline.CaptionSource(*captionSource),- BilingualTop: *bilingualTop,- MaxWordOneLine: *maxWordOneLine,- SubtitleStyleFile: *subtitleStyleFile,+ Input: input,+ Workdir: *workdir,+ TaskID: *taskID,+ OriginLang: *originLang,+ TargetLang: *targetLang,+ UserLang: *userLang,+ CaptionSource: pipeline.CaptionSource(*captionSource),+ BilingualTop: *bilingualTop,+ MaxWordOneLine: *maxWordOneLine,},}, nil}@@ -362,19 +363,19 @@ func parseRender(name string, args []string, horizontal bool) (Command, error) {return Command{}, err}return Command{- Name: name,- DryRun: *dryRun,+ Name: name,+ DryRun: *dryRun,+ SubtitleStyleFile: *subtitleStyleFile,Render: pipeline.RenderRequest{- Workdir: *workdir,- TaskID: *taskID,- Video: *video,- Audio: *audio,- Subtitle: *subtitle,- Horizontal: horizontal,- Dubbed: *dubbed,- MajorTitle: *majorTitle,- MinorTitle: *minorTitle,- SubtitleStyleFile: *subtitleStyleFile,+ Workdir: *workdir,+ TaskID: *taskID,+ Video: *video,+ Audio: *audio,+ Subtitle: *subtitle,+ Horizontal: horizontal,+ Dubbed: *dubbed,+ MajorTitle: *majorTitle,+ MinorTitle: *minorTitle,},}, nil}@@ -406,19 +407,19 @@ func parsePipeline(name string, args []string) (Command, error) {func dryRun(cmd Command) pipeline.Response {switch cmd.Name {case "subtitle":- if _, err := loadSubtitleStyleForCLI(cmd.Subtitle.SubtitleStyleFile); err != nil {+ if _, err := loadSubtitleStyleForCLI(cmd.SubtitleStyleFile); err != nil {return styleLoadFailure(pipeline.StageSubtitle, cmd.Subtitle.Workdir, cmd.Subtitle.TaskID, err)}return dryRunResponse(pipeline.StageSubtitle, cmd.Subtitle.Workdir, cmd.Subtitle.TaskID)case "tts":return dryRunManifest(cmd.TTS.Workdir, cmd.TTS.TaskID, pipeline.StageTTS, nil)case "render-horizontal":- if _, err := loadSubtitleStyleForCLI(cmd.Render.SubtitleStyleFile); err != nil {+ if _, err := loadSubtitleStyleForCLI(cmd.SubtitleStyleFile); err != nil {return styleLoadFailure(pipeline.StageRenderHorizontal, cmd.Render.Workdir, cmd.Render.TaskID, err)}return dryRunResponse(pipeline.StageRenderHorizontal, cmd.Render.Workdir, cmd.Render.TaskID)case "render-vertical":- if _, err := loadSubtitleStyleForCLI(cmd.Render.SubtitleStyleFile); err != nil {+ if _, err := loadSubtitleStyleForCLI(cmd.SubtitleStyleFile); err != nil {return styleLoadFailure(pipeline.StageRenderVertical, cmd.Render.Workdir, cmd.Render.TaskID, err)}return dryRunResponse(pipeline.StageRenderVertical, cmd.Render.Workdir, cmd.Render.TaskID)diff --git a/internal/cli/commands_test.go b/internal/cli/commands_test.goindex 871b578d..9b904ee4 100644--- a/internal/cli/commands_test.go+++ b/internal/cli/commands_test.go@@ -66,8 +66,8 @@ func TestParseSubtitleCommandAcceptsSubtitleStyleFile(t *testing.T) {if err != nil {t.Fatalf("Parse() error = %v", err)}- if cmd.Subtitle.SubtitleStyleFile != "style.json" {- t.Fatalf("SubtitleStyleFile = %q", cmd.Subtitle.SubtitleStyleFile)+ if cmd.SubtitleStyleFile != "style.json" {+ t.Fatalf("SubtitleStyleFile = %q", cmd.SubtitleStyleFile)}}@@ -89,8 +89,8 @@ func TestParseRenderCommandAcceptsSubtitleStyleFile(t *testing.T) {if err != nil {t.Fatalf("Parse() error = %v", err)}- if cmd.Render.SubtitleStyleFile != "style.json" {- t.Fatalf("SubtitleStyleFile = %q", cmd.Render.SubtitleStyleFile)+ if cmd.SubtitleStyleFile != "style.json" {+ t.Fatalf("SubtitleStyleFile = %q", cmd.SubtitleStyleFile)}}diff --git a/internal/pipeline/render.go b/internal/pipeline/render.goindex f136b445..6e6dc938 100644--- a/internal/pipeline/render.go+++ b/internal/pipeline/render.go@@ -11,17 +11,16 @@ import ()type RenderRequest struct {- Workdir string- TaskID string- Video string- Audio string- Subtitle string- Horizontal bool- Dubbed bool- MajorTitle string- MinorTitle string- SubtitleStyleFile string- SubtitleStyle *subtitlestyle.StyleSet+ Workdir string+ TaskID string+ Video string+ Audio string+ Subtitle string+ Horizontal bool+ Dubbed bool+ MajorTitle string+ MinorTitle string+ SubtitleStyle *subtitlestyle.StyleSet}func Render(ctx context.Context, svc StageService, req RenderRequest) (Response, error) {diff --git a/internal/pipeline/subtitle.go b/internal/pipeline/subtitle.goindex 328f2cc1..635455d3 100644--- a/internal/pipeline/subtitle.go+++ b/internal/pipeline/subtitle.go@@ -13,17 +13,16 @@ import (const defaultSubtitleMaxWordOneLine = 12type SubtitleRequest struct {- Input string- Workdir string- TaskID string- OriginLang string- TargetLang string- UserLang string- CaptionSource CaptionSource- BilingualTop bool- MaxWordOneLine int- SubtitleStyleFile string- SubtitleStyle *subtitlestyle.StyleSet+ Input string+ Workdir string+ TaskID string+ OriginLang string+ TargetLang string+ UserLang string+ CaptionSource CaptionSource+ BilingualTop bool+ MaxWordOneLine int+ SubtitleStyle *subtitlestyle.StyleSet}func GenerateSubtitles(ctx context.Context, svc StageService, req SubtitleRequest) (Response, error) {