Retrieve programmer's information from the profile if the flag is not used

Author: MatteoPologruto

commands/upload/upload.go

@@ -146,14 +146,19 @@ func Upload(ctx context.Context, req *rpc.UploadRequest, outStream io.Writer, er
 		fqbn = pme.GetProfile().FQBN
 	}
 
+	programmer := req.GetProgrammer()
+	if programmer == "" && pme.GetProfile() != nil {
+		programmer = pme.GetProfile().Programmer
+	}
+
 	updatedPort, err := runProgramAction(
 		pme,
 		sk,
 		req.GetImportFile(),
 		req.GetImportDir(),
 		fqbn,
 		req.GetPort(),
-		req.GetProgrammer(),
+		programmer,
 		req.GetVerbose(),
 		req.GetVerify(),
 		false, // burnBootloader

internal/cli/arguments/programmer.go

@@ -56,3 +56,8 @@ func (p *Programmer) String(inst *commands.Instance, fqbn string) string {
 	}
 	return details.GetDefaultProgrammerId()
 }
+
+// GetProgrammer returns the programmer specified by the user
+func (p *Programmer) GetProgrammer() string {
+	return p.programmer
+}

internal/cli/compile/compile.go

@@ -268,6 +268,11 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 			}
 		}
 
+		prog := profile.GetProgrammer()
+		if prog == "" || programmer.GetProgrammer() != "" {
+			prog = programmer.String(inst, fqbn)
+		}
+
 		uploadRequest := &rpc.UploadRequest{
 			Instance:   inst,
 			Fqbn:       fqbn,
@@ -276,7 +281,7 @@ func runCompileCommand(cmd *cobra.Command, args []string) {
 			Verbose:    verbose,
 			Verify:     verify,
 			ImportDir:  buildPath,
-			Programmer: programmer.String(inst, fqbn),
+			Programmer: prog,
 			UserFields: fields,
 		}
 

internal/cli/upload/upload.go

@@ -176,6 +176,11 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
 		path = sketchPath.String()
 	}
 
+	prog := profile.GetProgrammer()
+	if prog == "" || programmer.GetProgrammer() != "" {
+		prog = programmer.String(inst, fqbn)
+	}
+
 	stdOut, stdErr, stdIOResult := feedback.OutputStreams()
 	req := &rpc.UploadRequest{
 		Instance:   inst,
@@ -186,7 +191,7 @@ func runUploadCommand(args []string, uploadFieldsArgs map[string]string) {
 		Verify:     verify,
 		ImportFile: importFile,
 		ImportDir:  importDir,
-		Programmer: programmer.String(inst, fqbn),
+		Programmer: prog,
 		DryRun:     dryRun,
 		UserFields: fields,
 	}