Music Pipeline Configuration Hardening

This commit is contained in:
2026-05-08 11:22:57 +02:00
parent 75942b0940
commit c7fd63a80c
6 changed files with 265 additions and 9 deletions
+4 -3
View File
@@ -8,6 +8,8 @@ import (
"slices"
"strings"
"time"
"gitea.westgate.pw/ShadowsOverWestgate/sow-tools/internal/music"
)
const (
@@ -249,7 +251,7 @@ func (p *Project) EffectiveConfig() EffectiveConfig {
musicMaxStemLength := 16
musicNamingScheme := DefaultMusicNamingScheme
musicOutputExtension := DefaultMusicOutputExtension
musicConvertExtensions := []string{".mp3", ".ogg"}
musicConvertExtensions := music.DefaultConvertExtensions()
if d := p.Config.Music.Defaults; d != nil {
if d.StageRoot != "" {
musicStageRoot = expandPathTemplate(d.StageRoot, paths)
@@ -318,7 +320,6 @@ func (p *Project) EffectiveConfig() EffectiveConfig {
ConvertExtensions: dsConvertExtensions,
}
}
effective := EffectiveConfig{
ConfigSource: p.ConfigSource,
Module: p.Config.Module,
@@ -428,7 +429,7 @@ func markMissingDefaults(provenance ConfigProvenance) {
"music.max_stem_length": "16",
"music.naming_scheme": DefaultMusicNamingScheme,
"music.output_extension": DefaultMusicOutputExtension,
"music.convert_extensions": ".mp3, .ogg",
"music.convert_extensions": strings.Join(music.DefaultConvertExtensions(), ", "),
"topdata.build": DefaultTopDataBuild,
"topdata.compiled_2da_dir": DefaultTopDataCompiled2DADir,
"topdata.compiled_tlk": DefaultTopDataCompiledTLK,