move variable to downloadCfg

Author: LumePart

sample.env

@@ -33,6 +33,8 @@ LIBRARY_NAME=
 # USE_SUBDIRECTORY=true
 # Keep original file permissions when moving files (set to false on Synology devices)
 # KEEP_PERMISSIONS=true
+# Rename migrated track in {artist}-{title} format
+# RENAME_TRACK=false
 # Comma-separated list (no spaces) of download services, in priority order (default: youtube)
 # DOWNLOAD_SERVICES=youtube
 
@@ -60,8 +62,6 @@ YOUTUBE_API_KEY=
 # SLSKD_API_KEY=
 # Whether to move downloads under the DOWNLOAD_DIR or not (default: false)
 # MIGRATE_DOWNLOADS=false
-# Rename migrated track in {artist}-{title} format
-# RENAME_TRACK=false
 # Directory where slskd downloads tracks (default: /slskd/)
 # PS! This is only needed on the binary version, in docker it's set through volume mapping
 # SLSKD_DIR=/slskd/

src/config/config.go

@@ -72,6 +72,7 @@ type DownloadConfig struct {
 	Slskd Slskd
 	ExcludeLocal bool
 	KeepPermissions bool `env:"KEEP_PERMISSIONS" env-default:"true"` // keep original file permissions when migrating download
+	RenameTrack bool `env:"RENAME_TRACK" env-default:"false"` // Rename track in {title}-{artist} format
 	UseSubDir bool `env:"USE_SUBDIRECTORY" env-default:"true"`
 	Discovery string `env:"LISTENBRAINZ_DISCOVERY" env-default:"playlist"`
 	Services []string `env:"DOWNLOAD_SERVICES" env-default:"youtube"`
@@ -105,7 +106,6 @@ type Slskd struct {
 	DownloadAttempts int `env:"SLSKD_DL_ATTEMPTS" env-default:"3"` // Max number of files to attempt downloading per track
 	SlskdDir string `env:"SLSKD_DIR" env-default:"/slskd/"`
 	MigrateDL bool `env:"MIGRATE_DOWNLOADS" env-default:"false"` // Move downloads from SlskdDir to DownloadDir
-	RenameTrack bool `env:"RENAME_TRACK" env-default:"false"` // Rename track in {title}-{artist} format
 	Timeout int `env:"SLSKD_TIMEOUT" env-default:"20"`
 	Filters Filters
 	MonitorConfig SlskdMon

src/downloader/downloader.go

@@ -178,7 +178,7 @@ func (c *DownloadClient) MoveDownload(srcDir, destDir, trackPath string, track *
 	trackDir := filepath.Join(srcDir, trackPath)
 	srcFile := filepath.Join(trackDir, track.File)
 
-	if c.Cfg.Slskd.RenameTrack { // Rename file to {title}-{artist} format
+	if c.Cfg.RenameTrack { // Rename file to {title}-{artist} format
 		track.File = getFilename(track.CleanTitle, track.MainArtist) + filepath.Ext(track.File)
 	}