move persistance variable from env to flags

Author: LumePart

src/config/config.go

@@ -18,7 +18,8 @@ type Config struct {
 	DiscoveryCfg DiscoveryConfig
 	ClientCfg ClientConfig
 	Flags Flags 
-	Persist bool `env:"PERSIST" env-default:"true"`
+	PersistENV bool `env:"PERSIST" env-default:"true"`
+	Persist bool
 	System string `env:"EXPLO_SYSTEM"`
 	Debug bool `env:"DEBUG" env-default:"false"`
 	LogLevel string `env:"LOG_LEVEL" env-default:"WARN"`
@@ -29,6 +30,8 @@ type Flags struct {
 	Playlist string
 	DownloadMode string
 	ExcludeLocal bool
+	Persist bool
+	PersistSet bool
 }
 
 type ClientConfig struct {
@@ -162,6 +165,13 @@ func (cfg *Config) HandleDeprecation() { //
 		slog.Warn("'DEBUG' variable is deprecated, please use LOG_LEVEL=DEBUG instead")
 		cfg.LogLevel = "DEBUG"
 	}
+	if !cfg.PersistENV {
+		slog.Warn("'PERSIST' variable is deprecated, use --persist flag instead")
+	}
+
+	if !cfg.Persist && !cfg.DownloadCfg.UseSubDir {
+		slog.Warn("Deleting tracks requires 'USE_SUBDIRECTORY' to be true")
+	}
 }
 
 func (cfg *Config) GetPlaylistName() { // Generate playlist name and description

src/config/flags.go

@@ -16,12 +16,15 @@ func (cfg *Config) GetFlags() error {
 	var configPath string
 	var playlist string
 	var downloadMode string
-	var ExcludeLocal bool
+	var excludeLocal bool
+	var persist bool
 	// Long flags
 	flag.StringVarP(&configPath, "config", "c", ".env", "Path of the configuration file")
 	flag.StringVarP(&playlist, "playlist", "p", "weekly-exploration", "Playlist where to get tracks. Supported: weekly-exploration, weekly-jams, daily-jams")
 	flag.StringVarP(&downloadMode, "download-mode", "d", "normal", "Download mode: 'normal' (download only when track is not found locally), 'skip' (skip downloading, only use tracks already found locally), 'force' (always download, don't check for local tracks)")
-	flag.BoolVarP(&ExcludeLocal, "exclude-local", "e",  false, "Exclude locally found tracks from the imported playlist")
+	flag.BoolVarP(&excludeLocal, "exclude-local", "e",  false, "Exclude locally found tracks from the imported playlist")
+	flag.BoolVar(&persist, "persist", true, "Keep playlists between generations")
+	persistSet := flag.Lookup("persist").Changed
 
 	flag.Parse()
 
@@ -40,14 +43,25 @@ func (cfg *Config) GetFlags() error {
 	cfg.Flags.CfgPath = configPath
 	cfg.Flags.Playlist = playlist
 	cfg.Flags.DownloadMode = downloadMode
-	cfg.Flags.ExcludeLocal = ExcludeLocal
+	cfg.Flags.ExcludeLocal = excludeLocal
+	cfg.Flags.Persist = persist
+
+	// for deprecation purposes (can be removed at a later date)
+	cfg.Flags.PersistSet = persistSet
+
 	cfg.mergeFlags()
 	return nil
 }
 
 func (cfg *Config) mergeFlags() {
 	cfg.DiscoveryCfg.Listenbrainz.ImportPlaylist = cfg.Flags.Playlist
 	cfg.DownloadCfg.ExcludeLocal = cfg.Flags.ExcludeLocal
+	
+	if cfg.Flags.PersistSet {
+		cfg.Persist = cfg.Flags.Persist
+	} else {
+		cfg.Persist = cfg.PersistENV
+	}
 }
 
 func contains(valid []string, val string) bool {

src/main/main.go

@@ -58,7 +58,7 @@ func main() {
 		slog.Error(err.Error())
 		os.Exit(1)
 	}
-	if !cfg.Persist {
+	if !cfg.Persist && cfg.DownloadCfg.UseSubDir {
 		err := client.DeletePlaylist()
 		if err != nil {
 			slog.Warn(err.Error())