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: harden explicit subtitle rendering
wulienbed506f82299
diff --git a/internal/service/render_stage.go b/internal/service/render_stage.goindex 399dd36d..92afd7d0 100644--- a/internal/service/render_stage.go+++ b/internal/service/render_stage.go@@ -5,6 +5,7 @@ import ("fmt""krillin-ai/internal/storage""krillin-ai/internal/types"+ "os""os/exec""path/filepath""strings"@@ -20,13 +21,26 @@ type RenderVideoRequest struct {}func (s Service) RenderVideo(ctx context.Context, req RenderVideoRequest) (string, error) {- _ = ctx- return renderSubtitleFile(req)+ return renderSubtitleFile(ctx, req)+}++func renderAssPath(req RenderVideoRequest) string {+ base := strings.TrimSuffix(filepath.Base(req.OutputFile), filepath.Ext(req.OutputFile))+ if base == "" || base == "." {+ base = "subtitles"+ }+ return filepath.Join(req.Workdir, fmt.Sprintf("formatted_%s.ass", base))+}++func escapeAssFilterPath(path string) string {+ p := strings.ReplaceAll(path, "\\", "/")+ p = strings.ReplaceAll(p, ":", `\:`)+ return p}func buildEmbedSubtitleArgs(req RenderVideoRequest) ([]string, string) {- assPath := filepath.Join(req.Workdir, "formatted_subtitles.ass")- ass := strings.ReplaceAll(assPath, "\\", "/")+ assPath := renderAssPath(req)+ ass := escapeAssFilterPath(assPath)return []string{"-y","-i", req.InputVideo,@@ -37,8 +51,12 @@ func buildEmbedSubtitleArgs(req RenderVideoRequest) ([]string, string) {}, assPath}-func renderSubtitleFile(req RenderVideoRequest) (string, error) {- assPath := filepath.Join(req.Workdir, "formatted_subtitles.ass")+func renderSubtitleFile(ctx context.Context, req RenderVideoRequest) (string, error) {+ if err := os.MkdirAll(filepath.Dir(req.OutputFile), 0755); err != nil {+ return "", fmt.Errorf("renderSubtitleFile mkdir output dir error: %w", err)+ }++ assPath := renderAssPath(req)stepParam := req.StepParamif stepParam == nil {stepParam = &types.SubtitleTaskStepParam{TaskBasePath: req.Workdir}@@ -47,7 +65,7 @@ func renderSubtitleFile(req RenderVideoRequest) (string, error) {return "", fmt.Errorf("renderSubtitleFile srtToAss error: %w", err)}args, _ := buildEmbedSubtitleArgs(req)- cmd := exec.Command(storage.FfmpegPath, args...)+ cmd := exec.CommandContext(ctx, storage.FfmpegPath, args...)output, err := cmd.CombinedOutput()if err != nil {return "", fmt.Errorf("renderSubtitleFile ffmpeg error: %w, output: %s", err, string(output))diff --git a/internal/service/render_stage_test.go b/internal/service/render_stage_test.goindex 6f679453..4ffc89b5 100644--- a/internal/service/render_stage_test.go+++ b/internal/service/render_stage_test.go@@ -26,3 +26,27 @@ func TestBuildEmbedSubtitleArgsUsesRequestedSubtitleAndOutput(t *testing.T) {t.Fatalf("args do not contain output file: %v", args)}}++func TestRenderAssPathDerivesFromOutputFile(t *testing.T) {+ req := RenderVideoRequest{+ Workdir: "tasks/demo",+ OutputFile: "tasks/demo/output/horizontal_dubbed.mp4",+ }++ got := renderAssPath(req)+ want := filepath.Join("tasks", "demo", "formatted_horizontal_dubbed.ass")+ if got != want {+ t.Fatalf("renderAssPath() = %q, want %q", got, want)+ }+ if strings.Contains(got, "formatted_subtitles.ass") {+ t.Fatalf("renderAssPath() still uses fixed subtitle name: %q", got)+ }+}++func TestEscapeAssFilterPathEscapesWindowsDriveAndSeparators(t *testing.T) {+ got := escapeAssFilterPath(`C:\tasks\demo\formatted_horizontal_dubbed.ass`)+ want := `C\:/tasks/demo/formatted_horizontal_dubbed.ass`+ if got != want {+ t.Fatalf("escapeAssFilterPath() = %q, want %q", got, want)+ }+}diff --git a/internal/service/srt_embed.go b/internal/service/srt_embed.goindex 30a2a069..b7339be6 100644--- a/internal/service/srt_embed.go+++ b/internal/service/srt_embed.go@@ -319,7 +319,7 @@ func embedSubtitles(stepParam *types.SubtitleTaskStepParam, isHorizontal bool, winput = stepParam.VideoWithTtsFilePath}- _, err := renderSubtitleFile(RenderVideoRequest{+ _, err := renderSubtitleFile(context.Background(), RenderVideoRequest{Workdir: stepParam.TaskBasePath,InputVideo: input,SubtitleFile: stepParam.BilingualSrtFilePath,