🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Add option to specify ConfigFile path
Deluancccd0235cfa0
diff --git a/conf/configuration.go b/conf/configuration.goindex c1b18aa78..1708eddcb 100644--- a/conf/configuration.go+++ b/conf/configuration.go@@ -13,6 +13,7 @@ import ()type nd struct {+ ConfigFile string `default:"./navidrome.toml"`Port string `default:"4533"`MusicFolder string `default:"./music"`DataFolder string `default:"./"`@@ -39,6 +40,28 @@ type nd struct {var Server = &nd{}+// TODO refactor configuration and use something different. Maybe https://github.com/spf13/cobra+// This function loads the config just load the ConfigFile. This is very cumbersome, but doesn't+// seem there's a simpler way to do thiswith multiconfig. Time to replace this library?+func configFile() string {+ conf := &nd{}+ loader := multiconfig.MultiLoader(+ &multiconfig.TagLoader{},+ &multiconfig.EnvironmentLoader{},+ &multiconfig.FlagLoader{},+ )+ d := &multiconfig.DefaultLoader{}+ d.Loader = loader+ d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{})+ if err := d.Load(conf); err != nil {+ return consts.LocalConfigFile+ }+ if _, err := os.Stat(conf.ConfigFile); err == nil {+ return conf.ConfigFile+ }+ return consts.LocalConfigFile+}+func newWithPath(path string, skipFlags ...bool) *multiconfig.DefaultLoader {var loaders []multiconfig.Loader@@ -96,5 +119,5 @@ func LoadFromFile(confFile string, skipFlags ...bool) {}func Load() {- LoadFromFile(consts.LocalConfigFile)+ LoadFromFile(configFile())}diff --git a/tests/navidrome-test.toml b/tests/navidrome-test.tomlindex 7b80a4fff..e6b5b4f73 100644--- a/tests/navidrome-test.toml+++ b/tests/navidrome-test.toml@@ -2,5 +2,6 @@ DevDisableAuthentication = falseUser = "deluan"Password = "wordpass"DbPath = "file::memory:?cache=shared"-MusicFolder = "./tests/itunes-library.xml"+MusicFolder = "./tests/fixtures"+DataFolder = "data/tests"DownsampleCommand = "ffmpeg -i %s -b:a %bk mp3 -"