Skip to content

Commit 93b2b86

Browse files
introduve IsPortFlagSet method recevier
1 parent 85b1a53 commit 93b2b86

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

internal/cli/arguments/port.go

+5
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,8 @@ func (p *Port) DetectFQBN(inst *rpc.Instance) (string, *rpc.Port) {
155155
}
156156
return "", nil
157157
}
158+
159+
// IsPortFlagSet returns true if the port address is provided
160+
func (p *Port) IsPortFlagSet() bool {
161+
return p.address != ""
162+
}

internal/cli/monitor/monitor.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ func NewCommand() *cobra.Command {
6767
if len(args) > 0 {
6868
sketchPath = args[0]
6969
}
70-
var portProvidedFromFlag bool
71-
if p := cmd.Flags().Lookup("port"); p != nil && p.Changed {
72-
portProvidedFromFlag = true
73-
}
74-
runMonitorCmd(&portArgs, &fqbnArg, &profileArg, sketchPath, configs, describe, timestamp, quiet, raw, portProvidedFromFlag)
70+
runMonitorCmd(&portArgs, &fqbnArg, &profileArg, sketchPath, configs, describe, timestamp, quiet, raw)
7571
},
7672
}
7773
portArgs.AddToCommand(monitorCommand)
@@ -87,7 +83,7 @@ func NewCommand() *cobra.Command {
8783

8884
func runMonitorCmd(
8985
portArgs *arguments.Port, fqbnArg *arguments.Fqbn, profileArg *arguments.Profile, sketchPathArg string,
90-
configs []string, describe, timestamp, quiet, raw bool, portProvidedFromFlag bool,
86+
configs []string, describe, timestamp, quiet, raw bool,
9187
) {
9288
logrus.Info("Executing `arduino-cli monitor`")
9389

@@ -101,7 +97,7 @@ func runMonitorCmd(
10197
defaultPort, defaultProtocol string
10298
)
10399

104-
if !portProvidedFromFlag {
100+
if !portArgs.IsPortFlagSet() {
105101
sketchPath := arguments.InitSketchPath(sketchPathArg)
106102
sketch, err := sk.LoadSketch(context.Background(), &rpc.LoadSketchRequest{SketchPath: sketchPath.String()})
107103
if err != nil {

0 commit comments

Comments
 (0)