Use feedback/result structs in cli commands instead of rpc ones

internal/cli/board/details.go

@@ -23,6 +23,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/internal/cli/arguments"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
+	"github.com/arduino/arduino-cli/internal/cli/feedback/result"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/arduino-cli/table"
@@ -74,7 +75,7 @@ func runDetailsCommand(fqbn string, showFullDetails, listProgrammers bool, showP
 	}
 
 	feedback.PrintResult(detailsResult{
-		details:         res,
+		details:         result.NewBoardDetailsResponse(res),
 		listProgrammers: listProgrammers,
 		showFullDetails: showFullDetails,
 		showProperties:  showPropertiesMode != arguments.ShowPropertiesDisabled,
@@ -84,7 +85,7 @@ func runDetailsCommand(fqbn string, showFullDetails, listProgrammers bool, showP
 // output from this command requires special formatting, let's create a dedicated
 // feedback.Result implementation
 type detailsResult struct {
-	details         *rpc.BoardDetailsResponse
+	details         *result.BoardDetailsResponse
 	listProgrammers bool
 	showFullDetails bool
 	showProperties  bool
@@ -99,7 +100,7 @@ func (dr detailsResult) String() string {
 
 	if dr.showProperties {
 		res := ""
-		for _, prop := range details.GetBuildProperties() {
+		for _, prop := range details.BuildProperties {
 			res += fmt.Sprintln(prop)
 		}
 		return res
@@ -109,7 +110,7 @@ func (dr detailsResult) String() string {
 		t := table.New()
 		t.AddRow(tr("Id"), tr("Programmer name"))
 		for _, programmer := range details.Programmers {
-			t.AddRow(programmer.GetId(), programmer.GetName())
+			t.AddRow(programmer.Id, programmer.Name)
 		}
 		return t.Render()
 	}
@@ -138,7 +139,7 @@ func (dr detailsResult) String() string {
 	t.AddRow(tr("Board name:"), details.Name)
 	t.AddRow(tr("FQBN:"), details.Fqbn)
 	addIfNotEmpty(tr("Board version:"), details.Version)
-	if details.GetDebuggingSupported() {
+	if details.DebuggingSupported {
 		t.AddRow(tr("Debugging supported:"), table.NewCell("✔", color.New(color.FgGreen)))
 	}
 
@@ -148,11 +149,15 @@ func (dr detailsResult) String() string {
 			table.NewCell("✔", color.New(color.FgGreen)))
 	}
 
-	for _, idp := range details.GetIdentificationProperties() {
+	for _, idp := range details.IdentificationProperties {
+		if idp.Properties == nil {
+			continue
+		}
 		t.AddRow() // get some space from above
 		header := tr("Identification properties:")
-		for k, v := range idp.GetProperties() {
-			t.AddRow(header, k+"="+v)
+		keys := idp.Properties.Keys()
+		for _, k := range keys {
+			t.AddRow(header, k+"="+idp.Properties.Get(k))
 			header = ""
 		}
 	}
@@ -213,7 +218,7 @@ func (dr detailsResult) String() string {
 
 	tab.AddRow(tr("Programmers:"), tr("ID"), tr("Name"))
 	for _, programmer := range details.Programmers {
-		tab.AddRow("", programmer.GetId(), programmer.GetName())
+		tab.AddRow("", programmer.Id, programmer.Name)
 	}
 
 	return t.Render() + tab.Render()

internal/cli/board/list.go

@@ -27,6 +27,7 @@ import (
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/internal/cli/arguments"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
+	"github.com/arduino/arduino-cli/internal/cli/feedback/result"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/arduino-cli/table"
@@ -81,7 +82,8 @@ func runListCommand(watch bool, timeout int64, fqbn string) {
 	for _, err := range discoveryErrors {
 		feedback.Warning(tr("Error starting discovery: %v", err))
 	}
-	feedback.PrintResult(result{ports})
+
+	feedback.PrintResult(listResult{result.NewDetectedPorts(ports)})
 }
 
 func watchList(inst *rpc.Instance) {
@@ -98,58 +100,60 @@ func watchList(inst *rpc.Instance) {
 	}
 
 	for event := range eventsChan {
-		feedback.PrintResult(watchEvent{
-			Type:   event.EventType,
-			Boards: event.Port.MatchingBoards,
-			Port:   event.Port.Port,
-			Error:  event.Error,
-		})
+		if res := result.NewBoardListWatchResponse(event); res != nil {
+			feedback.PrintResult(watchEventResult{
+				Type:   res.EventType,
+				Boards: res.Port.MatchingBoards,
+				Port:   res.Port.Port,
+				Error:  res.Error,
+			})
+		}
 	}
 }
 
 // output from this command requires special formatting, let's create a dedicated
 // feedback.Result implementation
-type result struct {
-	ports []*rpc.DetectedPort
+type listResult struct {
+	ports []*result.DetectedPort
 }
 
-func (dr result) Data() interface{} {
+func (dr listResult) Data() interface{} {
 	return dr.ports
 }
 
-func (dr result) String() string {
+func (dr listResult) String() string {
 	if len(dr.ports) == 0 {
 		return tr("No boards found.")
 	}
 
 	sort.Slice(dr.ports, func(i, j int) bool {
 		x, y := dr.ports[i].Port, dr.ports[j].Port
-		return x.GetProtocol() < y.GetProtocol() ||
-			(x.GetProtocol() == y.GetProtocol() && x.GetAddress() < y.GetAddress())
+		return x.Protocol < y.Protocol ||
+			(x.Protocol == y.Protocol && x.Address < y.Address)
 	})
 
 	t := table.New()
 	t.SetHeader(tr("Port"), tr("Protocol"), tr("Type"), tr("Board Name"), tr("FQBN"), tr("Core"))
 	for _, detectedPort := range dr.ports {
 		port := detectedPort.Port
-		protocol := port.GetProtocol()
-		address := port.GetAddress()
-		if port.GetProtocol() == "serial" {
-			address = port.GetAddress()
+		protocol := port.Protocol
+		address := port.Address
+		if port.Protocol == "serial" {
+			address = port.Address
 		}
-		protocolLabel := port.GetProtocolLabel()
-		if boards := detectedPort.GetMatchingBoards(); len(boards) > 0 {
+		protocolLabel := port.ProtocolLabel
+		if boards := detectedPort.MatchingBoards; len(boards) > 0 {
 			sort.Slice(boards, func(i, j int) bool {
 				x, y := boards[i], boards[j]
-				return x.GetName() < y.GetName() || (x.GetName() == y.GetName() && x.GetFqbn() < y.GetFqbn())
+				return x.Name < y.Name || (x.Name == y.Name && x.Fqbn < y.Fqbn)
 			})
 			for _, b := range boards {
-				board := b.GetName()
+				board := b.Name
 
 				// to improve the user experience, show on a dedicated column
 				// the name of the core supporting the board detected
 				var coreName = ""
-				fqbn, err := cores.ParseFQBN(b.GetFqbn())
+				fqbn, err := cores.ParseFQBN(b.Fqbn)
 				if err == nil {
 					coreName = fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch)
 				}
@@ -170,18 +174,18 @@ func (dr result) String() string {
 	return t.Render()
 }
 
-type watchEvent struct {
-	Type   string               `json:"eventType"`
-	Boards []*rpc.BoardListItem `json:"matching_boards,omitempty"`
-	Port   *rpc.Port            `json:"port,omitempty"`
-	Error  string               `json:"error,omitempty"`
+type watchEventResult struct {
+	Type   string                  `json:"eventType"`
+	Boards []*result.BoardListItem `json:"matching_boards,omitempty"`
+	Port   *result.Port            `json:"port,omitempty"`
+	Error  string                  `json:"error,omitempty"`
 }
 
-func (dr watchEvent) Data() interface{} {
+func (dr watchEventResult) Data() interface{} {
 	return dr
 }
 
-func (dr watchEvent) String() string {
+func (dr watchEventResult) String() string {
 	t := table.New()
 
 	event := map[string]string{
@@ -197,15 +201,15 @@ func (dr watchEvent) String() string {
 	if boards := dr.Boards; len(boards) > 0 {
 		sort.Slice(boards, func(i, j int) bool {
 			x, y := boards[i], boards[j]
-			return x.GetName() < y.GetName() || (x.GetName() == y.GetName() && x.GetFqbn() < y.GetFqbn())
+			return x.Name < y.Name || (x.Name == y.Name && x.Fqbn < y.Fqbn)
 		})
 		for _, b := range boards {
-			board := b.GetName()
+			board := b.Name
 
 			// to improve the user experience, show on a dedicated column
 			// the name of the core supporting the board detected
 			var coreName = ""
-			fqbn, err := cores.ParseFQBN(b.GetFqbn())
+			fqbn, err := cores.ParseFQBN(b.Fqbn)
 			if err == nil {
 				coreName = fmt.Sprintf("%s:%s", fqbn.Package, fqbn.PlatformArch)
 			}

internal/cli/board/listall.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
+	fResult "github.com/arduino/arduino-cli/internal/cli/feedback/result"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/arduino-cli/table"
@@ -63,32 +64,37 @@ func runListAllCommand(cmd *cobra.Command, args []string) {
 		feedback.Fatal(tr("Error listing boards: %v", err), feedback.ErrGeneric)
 	}
 
-	feedback.PrintResult(resultAll{list})
+	feedback.PrintResult(resultAll{fResult.NewBoardListAllResponse(list)})
 }
 
 // output from this command requires special formatting, let's create a dedicated
 // feedback.Result implementation
 type resultAll struct {
-	list *rpc.BoardListAllResponse
+	list *fResult.BoardListAllResponse
 }
 
 func (dr resultAll) Data() interface{} {
 	return dr.list
 }
 
 func (dr resultAll) String() string {
+	t := table.New()
+	t.SetHeader(tr("Board Name"), tr("FQBN"), "")
+
+	if dr.list == nil || len(dr.list.Boards) == 0 {
+		return t.Render()
+	}
+
 	sort.Slice(dr.list.Boards, func(i, j int) bool {
-		return dr.list.Boards[i].GetName() < dr.list.Boards[j].GetName()
+		return dr.list.Boards[i].Name < dr.list.Boards[j].Name
 	})
 
-	t := table.New()
-	t.SetHeader(tr("Board Name"), tr("FQBN"), "")
-	for _, item := range dr.list.GetBoards() {
+	for _, item := range dr.list.Boards {
 		hidden := ""
 		if item.IsHidden {
 			hidden = tr("(hidden)")
 		}
-		t.AddRow(item.GetName(), item.GetFqbn(), hidden)
+		t.AddRow(item.Name, item.Fqbn, hidden)
 	}
 	return t.Render()
 }

internal/cli/board/search.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/internal/cli/feedback"
+	fResult "github.com/arduino/arduino-cli/internal/cli/feedback/result"
 	"github.com/arduino/arduino-cli/internal/cli/instance"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	"github.com/arduino/arduino-cli/table"
@@ -60,32 +61,37 @@ func runSearchCommand(cmd *cobra.Command, args []string) {
 		feedback.Fatal(tr("Error searching boards: %v", err), feedback.ErrGeneric)
 	}
 
-	feedback.PrintResult(searchResults{res.Boards})
+	feedback.PrintResult(searchResults{fResult.NewBoardListItems(res.Boards)})
 }
 
 // output from this command requires special formatting so we create a dedicated
 // feedback.Result implementation
 type searchResults struct {
-	boards []*rpc.BoardListItem
+	boards []*fResult.BoardListItem
 }
 
 func (r searchResults) Data() interface{} {
 	return r.boards
 }
 
 func (r searchResults) String() string {
-	sort.Slice(r.boards, func(i, j int) bool {
-		return r.boards[i].GetName() < r.boards[j].GetName()
-	})
+	if len(r.boards) == 0 {
+		return ""
+	}
 
 	t := table.New()
 	t.SetHeader(tr("Board Name"), tr("FQBN"), tr("Platform ID"), "")
+
+	sort.Slice(r.boards, func(i, j int) bool {
+		return r.boards[i].Name < r.boards[j].Name
+	})
+
 	for _, item := range r.boards {
 		hidden := ""
 		if item.IsHidden {
 			hidden = tr("(hidden)")
 		}
-		t.AddRow(item.GetName(), item.GetFqbn(), item.Platform.Metadata.Id, hidden)
+		t.AddRow(item.Name, item.Fqbn, item.Platform.Metadata.Id, hidden)
 	}
 	return t.Render()
 }