refactor monitor command to be consistent with other commands

Author: umbynos

cli/monitor/monitor.go

@@ -37,17 +37,18 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var tr = i18n.Tr
-
-var portArgs arguments.Port
-var describe bool
-var configs []string
-var quiet bool
-var fqbn string
+var (
+	portArgs arguments.Port
+	describe bool
+	configs  []string
+	quiet    bool
+	fqbn     arguments.Fqbn
+	tr       = i18n.Tr
+)
 
 // NewCommand created a new `monitor` command
 func NewCommand() *cobra.Command {
-	cmd := &cobra.Command{
+	monitorCommand := &cobra.Command{
 		Use:   "monitor",
 		Short: tr("Open a communication port with a board."),
 		Long:  tr("Open a communication port with a board."),
@@ -56,16 +57,13 @@ func NewCommand() *cobra.Command {
 			"  " + os.Args[0] + " monitor -p /dev/ttyACM0 --describe",
 		Run: runMonitorCmd,
 	}
-	portArgs.AddToCommand(cmd)
-	cmd.Flags().BoolVar(&describe, "describe", false, tr("Show all the settings of the communication port."))
-	cmd.Flags().StringSliceVarP(&configs, "config", "c", []string{}, tr("Configuration of the port."))
-	cmd.Flags().BoolVarP(&quiet, "quiet", "q", false, tr("Run in silent mode, show only monitor input and output."))
-	cmd.Flags().StringVarP(&fqbn, "fqbn", "b", "", tr("Fully Qualified Board Name, e.g.: arduino:avr:uno"))
-	cmd.RegisterFlagCompletionFunc("fqbn", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return arguments.GetInstalledBoards(), cobra.ShellCompDirectiveDefault
-	})
-	cmd.MarkFlagRequired("port")
-	return cmd
+	portArgs.AddToCommand(monitorCommand)
+	monitorCommand.Flags().BoolVar(&describe, "describe", false, tr("Show all the settings of the communication port."))
+	monitorCommand.Flags().StringSliceVarP(&configs, "config", "c", []string{}, tr("Configuration of the port."))
+	monitorCommand.Flags().BoolVarP(&quiet, "quiet", "q", false, tr("Run in silent mode, show only monitor input and output."))
+	fqbn.AddToCommand(monitorCommand)
+	monitorCommand.MarkFlagRequired("port")
+	return monitorCommand
 }
 
 func runMonitorCmd(cmd *cobra.Command, args []string) {
@@ -84,7 +82,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
 	enumerateResp, err := monitor.EnumerateMonitorPortSettings(context.Background(), &rpc.EnumerateMonitorPortSettingsRequest{
 		Instance:     instance,
 		PortProtocol: portProtocol,
-		Fqbn:         fqbn,
+		Fqbn:         fqbn.GetFQBN(),
 	})
 	if err != nil {
 		feedback.Error(tr("Error getting port settings details: %s", err))
@@ -148,7 +146,7 @@ func runMonitorCmd(cmd *cobra.Command, args []string) {
 	portProxy, _, err := monitor.Monitor(context.Background(), &rpc.MonitorRequest{
 		Instance:          instance,
 		Port:              &rpc.Port{Address: portAddress, Protocol: portProtocol},
-		Fqbn:              fqbn,
+		Fqbn:              fqbn.GetFQBN(),
 		PortConfiguration: configuration,
 	})
 	if err != nil {

i18n/data/en.po

@@ -411,7 +411,7 @@ msgstr "Config file already exists, use --overwrite to discard the existing one.
 msgid "Config file written to: %s"
 msgstr "Config file written to: %s"
 
-#: cli/monitor/monitor.go:61
+#: cli/monitor/monitor.go:63
 msgid "Configuration of the port."
 msgstr "Configuration of the port."
 
@@ -431,7 +431,7 @@ msgstr "Configuring platform."
 msgid "Connected"
 msgstr "Connected"
 
-#: cli/monitor/monitor.go:177
+#: cli/monitor/monitor.go:176
 msgid "Connected to %s! Press CTRL-C to exit."
 msgstr "Connected to %s! Press CTRL-C to exit."
 
@@ -504,7 +504,7 @@ msgstr "Debugging not supported for board %s"
 msgid "Debugging supported:"
 msgstr "Debugging supported:"
 
-#: cli/monitor/monitor.go:195
+#: cli/monitor/monitor.go:194
 msgid "Default"
 msgstr "Default"
 
@@ -787,7 +787,7 @@ msgstr "Error getting information for library %s"
 msgid "Error getting libraries info: %v"
 msgstr "Error getting libraries info: %v"
 
-#: cli/monitor/monitor.go:90
+#: cli/monitor/monitor.go:89
 msgid "Error getting port settings details: %s"
 msgstr "Error getting port settings details: %s"
 
@@ -1083,7 +1083,6 @@ 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:80
-#: cli/monitor/monitor.go:63
 msgid "Fully Qualified Board Name, e.g.: arduino:avr:uno"
 msgstr "Fully Qualified Board Name, e.g.: arduino:avr:uno"
 
@@ -1130,7 +1129,7 @@ msgstr "Global variables use {0} bytes of dynamic memory."
 
 #: cli/core/list.go:84
 #: cli/core/search.go:114
-#: cli/monitor/monitor.go:195
+#: cli/monitor/monitor.go:194
 #: cli/outdated/outdated.go:62
 msgid "ID"
 msgstr "ID"
@@ -1471,7 +1470,7 @@ msgstr "Missing sketch path"
 msgid "Monitor '%s' not found"
 msgstr "Monitor '%s' not found"
 
-#: cli/monitor/monitor.go:143
+#: cli/monitor/monitor.go:142
 msgid "Monitor port settings:"
 msgstr "Monitor port settings:"
 
@@ -1576,8 +1575,8 @@ msgstr "OS:"
 msgid "Official Arduino board:"
 msgstr "Official Arduino board:"
 
-#: cli/monitor/monitor.go:52
-#: cli/monitor/monitor.go:53
+#: cli/monitor/monitor.go:54
+#: cli/monitor/monitor.go:55
 msgid "Open a communication port with a board."
 msgstr "Open a communication port with a board."
 
@@ -1722,8 +1721,8 @@ msgstr "Platform size (bytes):"
 msgid "Port"
 msgstr "Port"
 
-#: cli/monitor/monitor.go:164
-#: cli/monitor/monitor.go:171
+#: cli/monitor/monitor.go:163
+#: cli/monitor/monitor.go:170
 msgid "Port closed:"
 msgstr "Port closed:"
 
@@ -1802,7 +1801,7 @@ msgstr "Required tool:"
 msgid "Run as a daemon on port: %s"
 msgstr "Run as a daemon on port: %s"
 
-#: cli/monitor/monitor.go:62
+#: cli/monitor/monitor.go:64
 msgid "Run in silent mode, show only monitor input and output."
 msgstr "Run in silent mode, show only monitor input and output."
 
@@ -1860,7 +1859,7 @@ msgstr "Sets a setting value."
 msgid "Sets where to save the configuration file."
 msgstr "Sets where to save the configuration file."
 
-#: cli/monitor/monitor.go:195
+#: cli/monitor/monitor.go:194
 msgid "Setting"
 msgstr "Setting"
 
@@ -1877,7 +1876,7 @@ msgstr "Show all available core versions."
 msgid "Show all build properties used instead of compiling."
 msgstr "Show all build properties used instead of compiling."
 
-#: cli/monitor/monitor.go:60
+#: cli/monitor/monitor.go:62
 msgid "Show all the settings of the communication port."
 msgstr "Show all the settings of the communication port."
 
@@ -2324,7 +2323,7 @@ msgstr "VERSION"
 msgid "VERSION_NUMBER"
 msgstr "VERSION_NUMBER"
 
-#: cli/monitor/monitor.go:195
+#: cli/monitor/monitor.go:194
 msgid "Values"
 msgstr "Values"
 
@@ -2827,11 +2826,11 @@ msgstr "invalid platform archive size: %s"
 msgid "invalid pluggable monitor reference: %s"
 msgstr "invalid pluggable monitor reference: %s"
 
-#: cli/monitor/monitor.go:126
+#: cli/monitor/monitor.go:125
 msgid "invalid port configuration value for %s: %s"
 msgstr "invalid port configuration value for %s: %s"
 
-#: cli/monitor/monitor.go:135
+#: cli/monitor/monitor.go:134
 msgid "invalid port configuration: %s"
 msgstr "invalid port configuration: %s"