Skip to content

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.

fix: stabilize subtitle style CLI loading

wulien02a0ddabf246
diff --git a/internal/cli/commands.go b/internal/cli/commands.go
index 93179ee5..559c2580 100644
--- a/internal/cli/commands.go
+++ b/internal/cli/commands.go
@@ -9,11 +9,37 @@ import (
"krillin-ai/internal/pipeline"
subtitlestyle "krillin-ai/internal/subtitle_style"
"os"
+ "path/filepath"
+ "runtime"
"strings"
)
const defaultSubtitleStylePath = "config/subtitle-style-default.json"
+type subtitleStyleLoadError struct {
+ err error
+ user bool
+}
+
+func (e subtitleStyleLoadError) Error() string {
+ if e.err == nil {
+ return ""
+ }
+ return e.err.Error()
+}
+
+func (e subtitleStyleLoadError) Unwrap() error {
+ return e.err
+}
+
+func userStyleLoadError(err error) error {
+ return subtitleStyleLoadError{err: err, user: true}
+}
+
+func defaultStyleLoadError(err error) error {
+ return subtitleStyleLoadError{err: err}
+}
+
type Command struct {
Name string
Help bool
@@ -463,37 +489,91 @@ func dryRunError(stage pipeline.Stage, workdir, taskID, code string, err error)
func loadSubtitleStyleForCLI(styleFile string) (*subtitlestyle.StyleSet, error) {
base := subtitlestyle.DefaultStyleSet()
- if _, err := os.Stat(defaultSubtitleStylePath); err == nil {
- fileStyle, err := subtitlestyle.LoadOverrideFile(defaultSubtitleStylePath)
+ if defaultPath, ok, err := findDefaultSubtitleStylePath(); err != nil {
+ return nil, defaultStyleLoadError(err)
+ } else if ok {
+ fileStyle, err := subtitlestyle.LoadOverrideFile(defaultPath)
if err != nil {
- return nil, err
+ return nil, defaultStyleLoadError(err)
}
base, err = subtitlestyle.Merge(base, fileStyle)
if err != nil {
- return nil, err
+ return nil, defaultStyleLoadError(err)
}
- } else if !errors.Is(err, os.ErrNotExist) {
- return nil, err
}
if strings.TrimSpace(styleFile) == "" {
return base, nil
}
override, err := subtitlestyle.LoadOverrideFile(styleFile)
if err != nil {
- return nil, err
+ return nil, userStyleLoadError(err)
+ }
+ merged, err := subtitlestyle.Merge(base, override)
+ if err != nil {
+ return nil, userStyleLoadError(err)
+ }
+ return merged, nil
+}
+
+func findDefaultSubtitleStylePath() (string, bool, error) {
+ paths := []string{defaultSubtitleStylePath}
+ if exe, err := os.Executable(); err == nil {
+ exeDir := filepath.Dir(exe)
+ paths = appendDefaultStyleParentPaths(paths, exeDir)
+ } else if !errors.Is(err, os.ErrNotExist) {
+ return "", false, err
+ }
+ if _, sourceFile, _, ok := runtime.Caller(0); ok {
+ paths = appendDefaultStyleParentPaths(paths, filepath.Dir(sourceFile))
+ }
+ if cwd, err := os.Getwd(); err == nil {
+ paths = appendDefaultStyleParentPaths(paths, cwd)
+ } else {
+ return "", false, err
+ }
+ seen := make(map[string]bool, len(paths))
+ for _, path := range paths {
+ clean := filepath.Clean(path)
+ if seen[clean] {
+ continue
+ }
+ seen[clean] = true
+ if _, err := os.Stat(clean); err == nil {
+ return clean, true, nil
+ } else if !errors.Is(err, os.ErrNotExist) {
+ return "", false, err
+ }
+ }
+ return "", false, nil
+}
+
+func appendDefaultStyleParentPaths(paths []string, dir string) []string {
+ for {
+ paths = append(paths, filepath.Join(dir, defaultSubtitleStylePath))
+ parent := filepath.Dir(dir)
+ if parent == dir {
+ return paths
+ }
+ dir = parent
}
- return subtitlestyle.Merge(base, override)
}
func styleLoadFailure(stage pipeline.Stage, workdir, taskID string, err error) pipeline.Response {
+ kind := pipeline.ErrorKindUsage
+ code := "subtitle_style_load_failed"
+ var styleErr subtitleStyleLoadError
+ if errors.As(err, &styleErr) && !styleErr.user {
+ kind = pipeline.ErrorKindInternal
+ code = "default_subtitle_style_load_failed"
+ }
return pipeline.Response{
OK: false,
Stage: stage,
Workdir: workdir,
TaskID: taskID,
Error: &pipeline.Error{
- Kind: pipeline.ErrorKindUsage,
- Code: "subtitle_style_load_failed",
+ Kind: kind,
+ Code: code,
Message: err.Error(),
},
}
diff --git a/internal/cli/commands_test.go b/internal/cli/commands_test.go
index cb9e65ae..871b578d 100644
--- a/internal/cli/commands_test.go
+++ b/internal/cli/commands_test.go
@@ -2,7 +2,9 @@ package cli
import (
"context"
+ "errors"
"krillin-ai/internal/pipeline"
+ subtitlestyle "krillin-ai/internal/subtitle_style"
"os"
"path/filepath"
"strings"
@@ -248,3 +250,65 @@ func TestExecuteDryRunRenderLoadsSubtitleStyleFile(t *testing.T) {
t.Fatalf("manifest exists after dry-run: err = %v", err)
}
}
+
+func TestLoadSubtitleStyleFindsRepoDefaultFromDifferentWorkingDir(t *testing.T) {
+ originalWd, err := os.Getwd()
+ if err != nil {
+ t.Fatal(err)
+ }
+ defaultPath, ok, err := findDefaultSubtitleStylePath()
+ if err != nil {
+ t.Fatalf("findDefaultSubtitleStylePath() error = %v", err)
+ }
+ if !ok {
+ t.Fatal("default subtitle style path not found")
+ }
+ t.Cleanup(func() {
+ if err := os.Chdir(originalWd); err != nil {
+ t.Fatalf("restore cwd: %v", err)
+ }
+ })
+ if err := os.Chdir(t.TempDir()); err != nil {
+ t.Fatal(err)
+ }
+
+ style, err := loadSubtitleStyleForCLI("")
+ if err != nil {
+ t.Fatalf("loadSubtitleStyleForCLI() error = %v", err)
+ }
+ defaultFile, err := subtitlestyle.LoadOverrideFile(defaultPath)
+ if err != nil {
+ t.Fatalf("load default file: %v", err)
+ }
+ if style.Horizontal.Major.PrimaryColor != defaultFile.Horizontal.Major.PrimaryColor {
+ t.Fatalf("primary color = %q, want repo default %q", style.Horizontal.Major.PrimaryColor, defaultFile.Horizontal.Major.PrimaryColor)
+ }
+}
+
+func TestStyleLoadFailureClassifiesDefaultStyleErrorsAsInternal(t *testing.T) {
+ err := defaultStyleLoadError(errors.New("broken default style"))
+ resp := styleLoadFailure(pipeline.StageRenderHorizontal, "work", "task", err)
+ if resp.Error == nil {
+ t.Fatal("Error = nil, want style load error")
+ }
+ if resp.Error.Kind != pipeline.ErrorKindInternal {
+ t.Fatalf("Kind = %s, want internal", resp.Error.Kind)
+ }
+ if resp.Error.Code != "default_subtitle_style_load_failed" {
+ t.Fatalf("Code = %q, want default_subtitle_style_load_failed", resp.Error.Code)
+ }
+}
+
+func TestStyleLoadFailureClassifiesUserStyleErrorsAsUsage(t *testing.T) {
+ err := userStyleLoadError(errors.New("missing user style"))
+ resp := styleLoadFailure(pipeline.StageRenderHorizontal, "work", "task", err)
+ if resp.Error == nil {
+ t.Fatal("Error = nil, want style load error")
+ }
+ if resp.Error.Kind != pipeline.ErrorKindUsage {
+ t.Fatalf("Kind = %s, want usage", resp.Error.Kind)
+ }
+ if resp.Error.Code != "subtitle_style_load_failed" {
+ t.Fatalf("Code = %q, want subtitle_style_load_failed", resp.Error.Code)
+ }
+}