overrides win
parent
57d9b74c31
commit
984b53c6f1
12
main.go
12
main.go
|
|
@ -156,7 +156,7 @@ func one(ctx context.Context, outd, inf string, patterns []string, overrides Fie
|
|||
continue
|
||||
}
|
||||
|
||||
found := overrides
|
||||
var found Fields
|
||||
groupNames := re.SubexpNames()
|
||||
groups := re.FindStringSubmatch(f)
|
||||
for i := 1; i < len(groupNames); i++ {
|
||||
|
|
@ -173,6 +173,16 @@ func one(ctx context.Context, outd, inf string, patterns []string, overrides Fie
|
|||
}
|
||||
}
|
||||
|
||||
for _, wr := range [][2]*string{
|
||||
[2]*string{&found.Title, &overrides.Title},
|
||||
[2]*string{&found.Season, &overrides.Season},
|
||||
[2]*string{&found.Episode, &overrides.Episode},
|
||||
} {
|
||||
if *wr[1] != "" {
|
||||
*wr[0] = *wr[1]
|
||||
}
|
||||
}
|
||||
|
||||
if found.Title == "" || found.Season == "" || found.Episode == "" {
|
||||
continue
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,10 +168,11 @@ func TestRecursive(t *testing.T) {
|
|||
}`)
|
||||
write("./showA/file.a")
|
||||
|
||||
// parse files
|
||||
// parse files and const wins
|
||||
write("./showB/.show-ingestion.yaml", `{
|
||||
"o": "`+outd+`/B_{{.Title}}_{{.Season}}_{{.Episode}}",
|
||||
"p": []
|
||||
"p": [],
|
||||
"c": {"title": "TITLE"}
|
||||
}`)
|
||||
write("./showB/title S01E02.b")
|
||||
|
||||
|
|
@ -198,7 +199,7 @@ func TestRecursive(t *testing.T) {
|
|||
}
|
||||
|
||||
exists(t, path.Join(outd, "A", "A_SAEA.a"))
|
||||
exists(t, path.Join(outd, "B_title_01_02", "title_S01E02.b"))
|
||||
exists(t, path.Join(outd, "B_TITLE_01_02", "TITLE_S01E02.b"))
|
||||
exists(t, path.Join(outd, "C", "t_SsEe.c"))
|
||||
notExists(t, path.Join(outd, "D", "title_S02E04.d"))
|
||||
notExists(t, path.Join(outd, "title_S03E06.e"))
|
||||
|
|
|
|||
Loading…
Reference in New Issue