Merge bbe8fe164df8ba915d1cba17da9871c2fe435a53 into e36fef869278ec75f7a8b5e9c51ac02ab600de71

cmd/root.go

@@ -346,7 +346,7 @@ func startPluginManager(ctx context.Context) func() error {
 // TODO: Implement some struct tags to map flags to viper
 func init() {
 	cobra.OnInitialize(func() {
-		conf.InitConfig(cfgFile, true)
+		conf.InitConfig(cfgFile)
 	})
 
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "configfile", "c", "", `config file (default "./navidrome.toml")`)

conf/configuration.go

@@ -617,7 +617,7 @@ func init() {
 	setViperDefaults()
 }
 
-func InitConfig(cfgFile string, loadEnvVars bool) {
+func InitConfig(cfgFile string) {
 	codecRegistry := viper.NewCodecRegistry()
 	_ = codecRegistry.RegisterCodec("ini", ini.Codec{
 		LoadOptions: ini.LoadOptions{
@@ -638,12 +638,10 @@ func InitConfig(cfgFile string, loadEnvVars bool) {
 	}
 
 	_ = viper.BindEnv("port")
-	if loadEnvVars {
+	viper.SetEnvPrefix("ND")
-		viper.SetEnvPrefix("ND")
+	replacer := strings.NewReplacer(".", "_")
-		replacer := strings.NewReplacer(".", "_")
+	viper.SetEnvKeyReplacer(replacer)
-		viper.SetEnvKeyReplacer(replacer)
+	viper.AutomaticEnv()
-		viper.AutomaticEnv()
-	}
 
 	err := viper.ReadInConfig()
 	if viper.ConfigFileUsed() != "" && err != nil {

conf/configuration_test.go

@@ -31,7 +31,7 @@ var _ = Describe("Configuration", func() {
 			filename := filepath.Join("testdata", "cfg."+format)
 
 			// Initialize config with the test file
-			conf.InitConfig(filename, false)
+			conf.InitConfig(filename)
 			// Load the configuration (with noConfigDump=true)
 			conf.Load(true)
 

ui/src/share/SharePlayer.jsx

@@ -53,7 +53,6 @@ const SharePlayer = () => {
     remove: false,
     spaceBar: true,
     volumeFade: { fadeIn: 200, fadeOut: 200 },
-    sortableOptions: { delay: 200, delayOnTouchOnly: true },
   }
   return (
     <ReactJkMusicPlayer