factor out the programmer flag handling

Author: umbynos

cli/arguments/port.go

@@ -46,6 +46,13 @@ type Fqbn struct {
 	fqbn string
 }
 
+// Programmer contains the arguments result.
+// This is useful so all flags used by commands that need
+// this information are consistent with each other.
+type Programmer struct {
+	programmer string
+}
+
 // AddToCommand adds the flags used to set port and protocol to the specified Command
 func (p *Port) AddToCommand(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&p.address, "port", "p", "", tr("Upload port address, e.g.: COM3 or /dev/ttyACM2"))
@@ -67,6 +74,14 @@ func (f *Fqbn) AddToCommand(cmd *cobra.Command) {
 	})
 }
 
+// AddToCommand adds the flags used to set the programmer to the specified Command
+func (p *Programmer) AddToCommand(cmd *cobra.Command) {
+	cmd.Flags().StringVarP(&p.programmer, "programmer", "P", "", tr("Use the specified programmer to upload."))
+	cmd.RegisterFlagCompletionFunc("programmer", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		return GetInstalledProgrammers(), cobra.ShellCompDirectiveDefault
+	})
+}
+
 // GetFQBN returns the fqbn
 func (f *Fqbn) GetFQBN() string {
 	return f.fqbn
@@ -77,6 +92,11 @@ func (f *Fqbn) SetFQBN(fqbn string) {
 	f.fqbn = fqbn
 }
 
+// GetProgrammer returns the programmer
+func (p *Programmer) GetProgrammer() string {
+	return p.programmer
+}
+
 // GetPortAddressAndProtocol returns only the port address and the port protocol
 // without any other port metadata obtained from the discoveries. This method allows
 // to bypass the discoveries unless the protocol is not specified: in this

cli/burnbootloader/burnbootloader.go

@@ -34,7 +34,7 @@ var (
 	port       arguments.Port
 	verbose    bool
 	verify     bool
-	programmer string
+	programmer arguments.Programmer
 	dryRun     bool
 	tr         = i18n.Tr
 )
@@ -52,12 +52,9 @@ func NewCommand() *cobra.Command {
 
 	fqbn.AddToCommand(burnBootloaderCommand)
 	port.AddToCommand(burnBootloaderCommand)
+	programmer.AddToCommand(burnBootloaderCommand)
 	burnBootloaderCommand.Flags().BoolVarP(&verify, "verify", "t", false, tr("Verify uploaded binary after the upload."))
 	burnBootloaderCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, tr("Turns on verbose mode."))
-	burnBootloaderCommand.Flags().StringVarP(&programmer, "programmer", "P", "", tr("Use the specified programmer to upload."))
-	burnBootloaderCommand.RegisterFlagCompletionFunc("programmer", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return arguments.GetInstalledProgrammers(), cobra.ShellCompDirectiveDefault
-	})
 	burnBootloaderCommand.Flags().BoolVar(&dryRun, "dry-run", false, tr("Do not perform the actual upload, just log out actions"))
 	burnBootloaderCommand.Flags().MarkHidden("dry-run")
 
@@ -80,7 +77,7 @@ func run(command *cobra.Command, args []string) {
 		Port:       discoveryPort.ToRPC(),
 		Verbose:    verbose,
 		Verify:     verify,
-		Programmer: programmer,
+		Programmer: programmer.GetProgrammer(),
 		DryRun:     dryRun,
 	}, os.Stdout, os.Stderr); err != nil {
 		feedback.Errorf(tr("Error during Upload: %v"), err)