refactor upload command to use code from the arguments package

Author: umbynos

cli/upload/upload.go

@@ -30,13 +30,13 @@ import (
 )
 
 var (
-	fqbn       string
+	fqbn       arguments.Fqbn
 	port       arguments.Port
 	verbose    bool
 	verify     bool
 	importDir  string
 	importFile string
-	programmer string
+	programmer arguments.Programmer
 	dryRun     bool
 	tr         = i18n.Tr
 )
@@ -49,36 +49,25 @@ func NewCommand() *cobra.Command {
 		Long:    tr("Upload Arduino sketches. This does NOT compile the sketch prior to upload."),
 		Example: "  " + os.Args[0] + " upload /home/user/Arduino/MySketch",
 		Args:    cobra.MaximumNArgs(1),
-		PreRun:  checkFlagsConflicts,
-		Run:     run,
+		PreRun: func(cmd *cobra.Command, args []string) {
+			arguments.CheckFlagsConflicts(cmd, "input-file", "input-dir")
+		},
+		Run: runUploadCommand,
 	}
 
-	uploadCommand.Flags().StringVarP(&fqbn, "fqbn", "b", "", tr("Fully Qualified Board Name, e.g.: arduino:avr:uno"))
-	uploadCommand.RegisterFlagCompletionFunc("fqbn", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return arguments.GetInstalledBoards(), cobra.ShellCompDirectiveDefault
-	})
+	fqbn.AddToCommand(uploadCommand)
 	port.AddToCommand(uploadCommand)
 	uploadCommand.Flags().StringVarP(&importDir, "input-dir", "", "", tr("Directory containing binaries to upload."))
 	uploadCommand.Flags().StringVarP(&importFile, "input-file", "i", "", tr("Binary file to upload."))
 	uploadCommand.Flags().BoolVarP(&verify, "verify", "t", false, tr("Verify uploaded binary after the upload."))
 	uploadCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, tr("Optional, turns on verbose mode."))
-	uploadCommand.Flags().StringVarP(&programmer, "programmer", "P", "", tr("Optional, use the specified programmer to upload."))
-	uploadCommand.RegisterFlagCompletionFunc("programmer", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return arguments.GetInstalledProgrammers(), cobra.ShellCompDirectiveDefault
-	})
+	programmer.AddToCommand(uploadCommand)
 	uploadCommand.Flags().BoolVar(&dryRun, "dry-run", false, tr("Do not perform the actual upload, just log out actions"))
 	uploadCommand.Flags().MarkHidden("dry-run")
 	return uploadCommand
 }
 
-func checkFlagsConflicts(command *cobra.Command, args []string) {
-	if importFile != "" && importDir != "" {
-		feedback.Errorf(tr("error: %s and %s flags cannot be used together", "--input-file", "--input-dir"))
-		os.Exit(errorcodes.ErrBadArgument)
-	}
-}
-
-func run(command *cobra.Command, args []string) {
+func runUploadCommand(command *cobra.Command, args []string) {
 	instance := instance.CreateAndInit()
 
 	path := ""
@@ -87,15 +76,15 @@ func run(command *cobra.Command, args []string) {
 	}
 	sketchPath, sk, discoveryPort := arguments.SketchPathCalculation(path, port, instance, true)
 
-	if fqbn == "" && sk != nil && sk.Metadata != nil {
+	if fqbn.GetFQBN() == "" && sk != nil && sk.Metadata != nil {
 		// If the user didn't specify an FQBN and a sketch.json file is present
 		// read it from there.
-		fqbn = sk.Metadata.CPU.Fqbn
+		fqbn.SetFQBN(sk.Metadata.CPU.Fqbn)
 	}
 
 	userFieldRes, err := upload.SupportedUserFields(context.Background(), &rpc.SupportedUserFieldsRequest{
 		Instance: instance,
-		Fqbn:     fqbn,
+		Fqbn:     fqbn.GetFQBN(),
 		Protocol: discoveryPort.Protocol,
 	})
 	if err != nil {
@@ -115,14 +104,14 @@ func run(command *cobra.Command, args []string) {
 
 	if _, err := upload.Upload(context.Background(), &rpc.UploadRequest{
 		Instance:   instance,
-		Fqbn:       fqbn,
+		Fqbn:       fqbn.GetFQBN(),
 		SketchPath: path,
 		Port:       discoveryPort.ToRPC(),
 		Verbose:    verbose,
 		Verify:     verify,
 		ImportFile: importFile,
 		ImportDir:  importDir,
-		Programmer: programmer,
+		Programmer: programmer.GetProgrammer(),
 		DryRun:     dryRun,
 		UserFields: fields,
 	}, os.Stdout, os.Stderr); err != nil {

i18n/data/en.po

@@ -212,7 +212,7 @@ msgstr "Available"
 msgid "Available Commands:"
 msgstr "Available Commands:"
 
-#: cli/upload/upload.go:62
+#: cli/upload/upload.go:61
 msgid "Binary file to upload."
 msgstr "Binary file to upload."
 
@@ -545,7 +545,7 @@ msgstr "Detects and displays a list of boards connected to the current computer.
 msgid "Directory containing binaries for debug."
 msgstr "Directory containing binaries for debug."
 
-#: cli/upload/upload.go:61
+#: cli/upload/upload.go:60
 msgid "Directory containing binaries to upload."
 msgstr "Directory containing binaries to upload."
 
@@ -570,7 +570,7 @@ msgid "Do not install dependencies."
 msgstr "Do not install dependencies."
 
 #: cli/burnbootloader/burnbootloader.go:58
-#: cli/upload/upload.go:69
+#: cli/upload/upload.go:65
 msgid "Do not perform the actual upload, just log out actions"
 msgstr "Do not perform the actual upload, just log out actions"
 
@@ -727,8 +727,8 @@ msgstr "Error during JSON encoding of the output: %v"
 #: cli/burnbootloader/burnbootloader.go:83
 #: cli/compile/compile.go:192
 #: cli/compile/compile.go:224
-#: cli/upload/upload.go:102
-#: cli/upload/upload.go:129
+#: cli/upload/upload.go:91
+#: cli/upload/upload.go:118
 msgid "Error during Upload: %v"
 msgstr "Error during Upload: %v"
 
@@ -1089,7 +1089,6 @@ msgstr "Force skip of post-install scripts (if the CLI is running interactively)
 #: cli/arguments/port.go:80
 #: cli/debug/debug.go:60
 #: cli/monitor/monitor.go:63
-#: cli/upload/upload.go:56
 msgid "Fully Qualified Board Name, e.g.: arduino:avr:uno"
 msgstr "Fully Qualified Board Name, e.g.: arduino:avr:uno"
 
@@ -1608,14 +1607,10 @@ msgid "Optional, suppresses almost every output."
 msgstr "Optional, suppresses almost every output."
 
 #: cli/compile/compile.go:95
-#: cli/upload/upload.go:64
+#: cli/upload/upload.go:63
 msgid "Optional, turns on verbose mode."
 msgstr "Optional, turns on verbose mode."
 
-#: cli/upload/upload.go:65
-msgid "Optional, use the specified programmer to upload."
-msgstr "Optional, use the specified programmer to upload."
-
 #: cli/compile/compile.go:113
 msgid "Optional. Path to a .json file that contains a set of replacements of the sketch source code."
 msgstr "Optional. Path to a .json file that contains a set of replacements of the sketch source code."
@@ -2272,7 +2267,7 @@ msgid "Upload the bootloader."
 msgstr "Upload the bootloader."
 
 #: cli/compile/compile.go:198
-#: cli/upload/upload.go:108
+#: cli/upload/upload.go:97
 msgid "Uploading to specified board using %s protocol requires the following info:"
 msgstr "Uploading to specified board using %s protocol requires the following info:"
 
@@ -2349,7 +2344,7 @@ msgstr "Values"
 
 #: cli/burnbootloader/burnbootloader.go:56
 #: cli/compile/compile.go:99
-#: cli/upload/upload.go:63
+#: cli/upload/upload.go:62
 msgid "Verify uploaded binary after the upload."
 msgstr "Verify uploaded binary after the upload."
 
@@ -2638,10 +2633,6 @@ msgstr "error processing response from server"
 msgid "error querying Arduino Cloud Api"
 msgstr "error querying Arduino Cloud Api"
 
-#: cli/upload/upload.go:76
-msgid "error: %s and %s flags cannot be used together"
-msgstr "error: %s and %s flags cannot be used together"
-
 #: arduino/resources/install.go:67
 msgid "extracting archive: %s"
 msgstr "extracting archive: %s"