Move deprecated CreateAlbums option normalization to config package

Signed-off-by: pacoorozco <[email protected]>

internal/cli/push/push.go

@@ -59,15 +59,7 @@ func (cmd *PushCmd) Run(cobraCmd *cobra.Command, args []string) error {
 	}
 
 	// launch all folder upload jobs
-	for _, config := range cli.Config.Jobs {
-
-		// TODO: CreateAlbums is maintained to ensure backwards compatibility.
-		//nolint:staticcheck // I want to use deprecated method.
-		if config.Album == "" && config.CreateAlbums != "" && config.CreateAlbums != "Off" {
-			//nolint:staticcheck // I want to use deprecated method.
-			config.Album = "auto:" + config.CreateAlbums
-		}
-
+	for _, config := range cli.Config.GetJobs() {
 		sourceFolder := config.SourceFolder
 
 		filterFiles, err := filter.Compile(config.IncludePatterns, config.ExcludePatterns)

internal/config/config.go

@@ -153,6 +153,19 @@ func (c Config) validateJobs(fs afero.Fs) error {
 	return nil
 }
 
+// GetJobs returns the configured Jobs without deprecated options.
+func (c Config) GetJobs() []FolderUploadJob {
+	jobs := c.Jobs
+
+	// TODO: Translate the deprecated CreateAlbums into the Albums option for backwards compatibility
+	for _, j := range jobs {
+		if j.Album == "" && j.CreateAlbums != "" && j.CreateAlbums != "Off" {
+			j.Album = "auto:" + j.CreateAlbums
+		}
+	}
+	return jobs
+}
+
 func (c Config) validateSecretsBackendType() error {
 	switch c.SecretsBackendType {
 	case "auto", "secret-service", "keychain", "kwallet", "file":
@@ -249,7 +262,6 @@ func defaultSettings() Config {
 			{
 				SourceFolder:      "YOUR_FOLDER_PATH",
 				Album:             "",
-				CreateAlbums:      "folderName",
 				DeleteAfterUpload: false,
 			},
 		},

internal/config/schema.go

@@ -37,7 +37,7 @@ type FolderUploadJob struct {
 	//             will be selected)
 	//   "auto:" : Followed either "folderPath" or "folderName" will use an autogenerated album name based on the
 	//             object's folder path or object's folder name.
-	Album string `json:"Album"`
+	Album string `json:"Album,omitempty"`
 
 	// CreateAlbums is the parameter to create albums on Google Photos.
 	//