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: support subtitle style version

wulienaa16757dbafb
diff --git a/internal/subtitle_style/style.go b/internal/subtitle_style/style.go
index 025b3329..1cc4cbc2 100644
--- a/internal/subtitle_style/style.go
+++ b/internal/subtitle_style/style.go
@@ -11,6 +11,7 @@ import (
)
type StyleSet struct {
+ Version int `json:"version,omitempty"`
Horizontal ScreenStyle `json:"horizontal"`
Vertical ScreenStyle `json:"vertical"`
}
@@ -52,6 +53,7 @@ type Style struct {
func DefaultStyleSet() *StyleSet {
return &StyleSet{
+ Version: 1,
Horizontal: ScreenStyle{
Major: defaultStyle("Major", 14, 2.5, 1.5, 20),
Minor: defaultStyle("Minor", 10, 2.5, 1.5, 30),
@@ -97,6 +99,9 @@ func Merge(base, override *StyleSet) (*StyleSet, error) {
}
merged := cloneStyleSet(base)
if override != nil {
+ if override.Version != 0 {
+ merged.Version = override.Version
+ }
mergeScreen(&merged.Horizontal, override.Horizontal)
mergeScreen(&merged.Vertical, override.Vertical)
}
@@ -481,6 +486,7 @@ func validateFloat(path string, value *float64, min, max float64) error {
func cloneStyleSet(set *StyleSet) StyleSet {
return StyleSet{
+ Version: set.Version,
Horizontal: ScreenStyle{
Major: cloneStyle(set.Horizontal.Major),
Minor: cloneStyle(set.Horizontal.Minor),
diff --git a/internal/subtitle_style/style_test.go b/internal/subtitle_style/style_test.go
index 4b888689..fb9b41d5 100644
--- a/internal/subtitle_style/style_test.go
+++ b/internal/subtitle_style/style_test.go
@@ -53,6 +53,16 @@ func TestLoadOverrideRejectsUnknownField(t *testing.T) {
}
}
+func TestDecodeAcceptsVersion(t *testing.T) {
+ got, err := Decode([]byte(`{"version":1,"horizontal":{"major":{"primary_color":"#FFFFFF"}}}`), "style.json")
+ if err != nil {
+ t.Fatalf("Decode() error = %v", err)
+ }
+ if got.Version != 1 {
+ t.Fatalf("version = %d, want 1", got.Version)
+ }
+}
+
func TestMergeKeepsDefaultsForMissingFields(t *testing.T) {
base := DefaultStyleSet()
override := &StyleSet{
@@ -76,6 +86,16 @@ func TestMergeKeepsDefaultsForMissingFields(t *testing.T) {
}
}
+func TestMergeOverridesVersion(t *testing.T) {
+ got, err := Merge(DefaultStyleSet(), &StyleSet{Version: 2})
+ if err != nil {
+ t.Fatalf("Merge() error = %v", err)
+ }
+ if got.Version != 2 {
+ t.Fatalf("version = %d, want 2", got.Version)
+ }
+}
+
func TestValidateRejectsInvalidColorWithFieldPath(t *testing.T) {
style := DefaultStyleSet()
style.Horizontal.Major.PrimaryColor = "not-a-color"