refactor function that checks for flags conflicts

Author: umbynos

cli/arguments/port.go

@@ -18,10 +18,12 @@ package arguments
 import (
 	"fmt"
 	"net/url"
+	"os"
 	"time"
 
 	"github.com/arduino/arduino-cli/arduino/discovery"
 	"github.com/arduino/arduino-cli/arduino/sketch"
+	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -189,3 +191,13 @@ func (p *Port) GetPort(instance *rpc.Instance, sk *sketch.Sketch) (*discovery.Po
 		}
 	}
 }
+
+// CheckFlagsConflicts is a helper function useful to report errors when 2 conflicting flags are used
+func CheckFlagsConflicts(command *cobra.Command, firstFlagName, secondFlagName string) {
+	flag1, _ := command.Flags().GetString(firstFlagName)
+	flag2, _ := command.Flags().GetString(secondFlagName)
+	if flag1 != "" && flag2 != "" {
+		feedback.Errorf(tr("Can't use both --%s and --%s flags at the same time.", firstFlagName, secondFlagName))
+		os.Exit(errorcodes.ErrBadArgument)
+	}
+}

cli/config/init.go

@@ -18,6 +18,7 @@ package config
 import (
 	"os"
 
+	"github.com/arduino/arduino-cli/cli/arguments"
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
 	"github.com/arduino/arduino-cli/configuration"
@@ -46,7 +47,10 @@ func initInitCommand() *cobra.Command {
 			"  " + os.Args[0] + " config init --dest-dir /home/user/MyDirectory\n" +
 			"  " + os.Args[0] + " config init --dest-file /home/user/MyDirectory/my_settings.yaml",
 		Args: cobra.NoArgs,
-		Run:  runInitCommand,
+		PreRun: func(cmd *cobra.Command, args []string) {
+			arguments.CheckFlagsConflicts(cmd, "dest-file", "dest-dir")
+		},
+		Run: runInitCommand,
 	}
 	initCommand.Flags().StringVar(&destDir, "dest-dir", "", tr("Sets where to save the configuration file."))
 	initCommand.Flags().StringVar(&destFile, "dest-file", "", tr("Sets where to save the configuration file."))
@@ -55,10 +59,6 @@ func initInitCommand() *cobra.Command {
 }
 
 func runInitCommand(cmd *cobra.Command, args []string) {
-	if destFile != "" && destDir != "" {
-		feedback.Errorf(tr("Can't use both --dest-file and --dest-dir flags at the same time."))
-		os.Exit(errorcodes.ErrGeneric)
-	}
 
 	var configFileAbsPath *paths.Path
 	var absPath *paths.Path

i18n/data/en.po

@@ -272,9 +272,9 @@ msgstr "Can't open sketch"
 msgid "Can't set multiple values in key %v"
 msgstr "Can't set multiple values in key %v"
 
-#: cli/config/init.go:59
-msgid "Can't use both --dest-file and --dest-dir flags at the same time."
-msgstr "Can't use both --dest-file and --dest-dir flags at the same time."
+#: cli/arguments/port.go:200
+msgid "Can't use both --%s and --%s flags at the same time."
+msgstr "Can't use both --%s and --%s flags at the same time."
 
 #: cli/config/add.go:59
 #: cli/config/delete.go:70
@@ -475,7 +475,7 @@ msgstr "Create a new Sketch"
 msgid "Creates a zip file containing all sketch files."
 msgstr "Creates a zip file containing all sketch files."
 
-#: cli/config/init.go:42
+#: cli/config/init.go:43
 msgid "Creates or updates the configuration file in the data directory or custom directory with the current configuration settings."
 msgstr "Creates or updates the configuration file in the data directory or custom directory with the current configuration settings."
 
@@ -1086,7 +1086,7 @@ msgstr "Force run of post-install scripts (if the CLI is not running interactive
 msgid "Force skip of post-install scripts (if the CLI is running interactively)."
 msgstr "Force skip of post-install scripts (if the CLI is running interactively)."
 
-#: cli/arguments/port.go:71
+#: cli/arguments/port.go:73
 #: cli/debug/debug.go:60
 #: cli/monitor/monitor.go:63
 #: cli/upload/upload.go:56
@@ -1437,7 +1437,7 @@ msgstr "Low memory available, stability problems may occur."
 msgid "Maintainer: %s"
 msgstr "Maintainer: %s"
 
-#: cli/arguments/port.go:66
+#: cli/arguments/port.go:68
 msgid "Max time to wait for port discovery, e.g.: 30s, 1m"
 msgstr "Max time to wait for port discovery, e.g.: 30s, 1m"
 
@@ -1628,7 +1628,7 @@ msgstr "OutputRate in Null monitor must be a float64"
 msgid "Override a build property with a custom value. Can be used multiple times for multiple properties."
 msgstr "Override a build property with a custom value. Can be used multiple times for multiple properties."
 
-#: cli/config/init.go:53
+#: cli/config/init.go:57
 msgid "Overwrite existing config file."
 msgstr "Overwrite existing config file."
 
@@ -1869,8 +1869,8 @@ msgstr "Server responded with: %s"
 msgid "Sets a setting value."
 msgstr "Sets a setting value."
 
-#: cli/config/init.go:51
-#: cli/config/init.go:52
+#: cli/config/init.go:55
+#: cli/config/init.go:56
 msgid "Sets where to save the configuration file."
 msgstr "Sets where to save the configuration file."
 
@@ -2251,15 +2251,15 @@ msgstr "Upload Arduino sketches."
 msgid "Upload Arduino sketches. This does NOT compile the sketch prior to upload."
 msgstr "Upload Arduino sketches. This does NOT compile the sketch prior to upload."
 
-#: cli/arguments/port.go:58
+#: cli/arguments/port.go:60
 msgid "Upload port address, e.g.: COM3 or /dev/ttyACM2"
 msgstr "Upload port address, e.g.: COM3 or /dev/ttyACM2"
 
 #: commands/upload/upload.go:409
 msgid "Upload port found on %s"
 msgstr "Upload port found on %s"
 
-#: cli/arguments/port.go:62
+#: cli/arguments/port.go:64
 msgid "Upload port protocol, e.g: serial"
 msgstr "Upload port protocol, e.g: serial"
 
@@ -2288,7 +2288,7 @@ msgstr "Usage:"
 msgid "Use %s for more information about a command."
 msgstr "Use %s for more information about a command."
 
-#: cli/arguments/port.go:79
+#: cli/arguments/port.go:81
 msgid "Use the specified programmer to upload."
 msgstr "Use the specified programmer to upload."
 
@@ -2401,11 +2401,11 @@ msgstr "Website: %s"
 msgid "When specified, VID/PID specific build properties are used, if board supports them."
 msgstr "When specified, VID/PID specific build properties are used, if board supports them."
 
-#: cli/config/init.go:41
+#: cli/config/init.go:42
 msgid "Writes current configuration to a configuration file."
 msgstr "Writes current configuration to a configuration file."
 
-#: cli/config/init.go:44
+#: cli/config/init.go:45
 msgid "Writes current configuration to the configuration file in the data directory."
 msgstr "Writes current configuration to the configuration file in the data directory."
 
@@ -3105,7 +3105,7 @@ msgstr "pluggable discovery already added: %s"
 msgid "port"
 msgstr "port"
 
-#: cli/arguments/port.go:188
+#: cli/arguments/port.go:190
 msgid "port not found: %[1]s %[2]s"
 msgstr "port not found: %[1]s %[2]s"