add uploader specific flag to upload command

Author: l3uddz

cmd/clean.go

@@ -11,7 +11,7 @@ import (
 
 var cleanCmd = &cobra.Command{
 	Use:   "clean",
-	Short: "Perform cleans associated to uploader(s)",
+	Short: "Perform cleans associated with uploader(s)",
 	Long:  `This command can be used to trigger a clean associated with uploader(s).`,
 
 	Run: func(cmd *cobra.Command, args []string) {
@@ -20,26 +20,24 @@ var cleanCmd = &cobra.Command{
 
 		// iterate uploader's
 		for uploaderName, uploaderConfig := range config.Config.Uploader {
+			log := log.WithField("uploader", uploaderName)
+
 			// skip disabled uploader(s)
 			if !uploaderConfig.Enabled {
-				log.WithField("uploader", uploaderName).Trace("Skipping disabled uploader")
+				log.Debug("Skipping disabled uploader")
 				continue
 			}
 
 			// skip uploader specific chosen
 			if flagUploader != "" && !strings.EqualFold(uploaderName, flagUploader) {
-				log.WithField("uploader", uploaderName).Tracef("Skipping uploader as not: %q",
-					flagUploader)
+				log.Debugf("Skipping uploader as not: %q", flagUploader)
 				continue
 			}
 
-			log := log.WithField("uploader", uploaderName)
-
 			// create uploader
 			upload, err := uploader.New(config.Config, &uploaderConfig, uploaderName)
 			if err != nil {
-				log.WithField("uploader", uploaderName).WithError(err).
-					Error("Failed initializing uploader, skipping...")
+				log.WithError(err).Error("Failed initializing uploader, skipping...")
 				continue
 			}
 
@@ -57,7 +55,7 @@ var cleanCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(cleanCmd)
 
-	cleanCmd.Flags().StringVarP(&flagUploader, "uploader", "u", "", "Run for a specific uploader.")
+	cleanCmd.Flags().StringVarP(&flagUploader, "uploader", "u", "", "Run for a specific uploader")
 }
 
 func performClean(u *uploader.Uploader) error {

cmd/upload.go

@@ -7,33 +7,38 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"strings"
 )
 
 var uploadCmd = &cobra.Command{
-	Use:   "upload [UPLOADER]",
-	Short: "Perform uploader task",
-	Long:  `This command can be used to trigger an uploader check / upload.`,
+	Use:   "upload",
+	Short: "Perform uploader task(s)",
+	Long:  `This command can be used to trigger an uploader check, clean & upload.`,
 
-	Args: cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		// init core
 		initCore(true)
 
 		// iterate uploader's
 		for uploaderName, uploaderConfig := range config.Config.Uploader {
+			log := log.WithField("uploader", uploaderName)
+
 			// skip disabled uploader(s)
 			if !uploaderConfig.Enabled {
-				log.WithField("uploader", uploaderName).Trace("Skipping disabled uploader")
+				log.Debug("Skipping disabled uploader")
 				continue
 			}
 
-			log := log.WithField("uploader", uploaderName)
+			// skip uploader specific chosen
+			if flagUploader != "" && !strings.EqualFold(uploaderName, flagUploader) {
+				log.Debugf("Skipping uploader as not: %q", flagUploader)
+				continue
+			}
 
 			// create uploader
 			upload, err := uploader.New(config.Config, &uploaderConfig, uploaderName)
 			if err != nil {
-				log.WithField("uploader", uploaderName).WithError(err).
-					Error("Failed initializing uploader, skipping...")
+				log.WithError(err).Error("Failed initializing uploader, skipping...")
 				continue
 			}
 
@@ -96,6 +101,8 @@ var uploadCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(uploadCmd)
+
+	uploadCmd.Flags().StringVarP(&flagUploader, "uploader", "u", "", "Run for a specific uploader")
 }
 
 func performUpload(u *uploader.Uploader) error {