Skip to content

Commit dcf7f86

Browse files
cli: board listall use feedback result structs
1 parent 3aee471 commit dcf7f86

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

internal/cli/board/listall.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323

2424
"github.com/arduino/arduino-cli/commands/board"
2525
"github.com/arduino/arduino-cli/internal/cli/feedback"
26+
fResult "github.com/arduino/arduino-cli/internal/cli/feedback/result"
2627
"github.com/arduino/arduino-cli/internal/cli/instance"
2728
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
2829
"github.com/arduino/arduino-cli/table"
@@ -63,32 +64,40 @@ func runListAllCommand(cmd *cobra.Command, args []string) {
6364
feedback.Fatal(tr("Error listing boards: %v", err), feedback.ErrGeneric)
6465
}
6566

66-
feedback.PrintResult(resultAll{list})
67+
feedback.PrintResult(resultAll{fResult.NewBoardListAllResponse(list)})
6768
}
6869

6970
// output from this command requires special formatting, let's create a dedicated
7071
// feedback.Result implementation
7172
type resultAll struct {
72-
list *rpc.BoardListAllResponse
73+
list *fResult.BoardListAllResponse
7374
}
7475

7576
func (dr resultAll) Data() interface{} {
7677
return dr.list
7778
}
7879

7980
func (dr resultAll) String() string {
81+
t := table.New()
82+
t.SetHeader(tr("Board Name"), tr("FQBN"), "")
83+
84+
if dr.list == nil || len(dr.list.Boards) == 0 {
85+
return t.Render()
86+
}
87+
8088
sort.Slice(dr.list.Boards, func(i, j int) bool {
81-
return dr.list.Boards[i].GetName() < dr.list.Boards[j].GetName()
89+
return dr.list.Boards[i].Name < dr.list.Boards[j].Name
8290
})
8391

84-
t := table.New()
85-
t.SetHeader(tr("Board Name"), tr("FQBN"), "")
86-
for _, item := range dr.list.GetBoards() {
92+
for _, item := range dr.list.Boards {
93+
if item == nil {
94+
continue
95+
}
8796
hidden := ""
8897
if item.IsHidden {
8998
hidden = tr("(hidden)")
9099
}
91-
t.AddRow(item.GetName(), item.GetFqbn(), hidden)
100+
t.AddRow(item.Name, item.Fqbn, hidden)
92101
}
93102
return t.Render()
94103
}

0 commit comments

Comments
 (0)