@@ -23,6 +23,7 @@ import (
23
23
"github.com/arduino/arduino-cli/commands/board"
24
24
"github.com/arduino/arduino-cli/internal/cli/arguments"
25
25
"github.com/arduino/arduino-cli/internal/cli/feedback"
26
+ fResult "github.com/arduino/arduino-cli/internal/cli/feedback/result"
26
27
"github.com/arduino/arduino-cli/internal/cli/instance"
27
28
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
28
29
"github.com/arduino/arduino-cli/table"
@@ -74,7 +75,7 @@ func runDetailsCommand(fqbn string, showFullDetails, listProgrammers bool, showP
74
75
}
75
76
76
77
feedback .PrintResult (detailsResult {
77
- details : res ,
78
+ details : fResult . NewBoardDetailsResponse ( res ) ,
78
79
listProgrammers : listProgrammers ,
79
80
showFullDetails : showFullDetails ,
80
81
showProperties : showPropertiesMode != arguments .ShowPropertiesDisabled ,
@@ -84,7 +85,7 @@ func runDetailsCommand(fqbn string, showFullDetails, listProgrammers bool, showP
84
85
// output from this command requires special formatting, let's create a dedicated
85
86
// feedback.Result implementation
86
87
type detailsResult struct {
87
- details * rpc .BoardDetailsResponse
88
+ details * fResult .BoardDetailsResponse
88
89
listProgrammers bool
89
90
showFullDetails bool
90
91
showProperties bool
@@ -99,7 +100,7 @@ func (dr detailsResult) String() string {
99
100
100
101
if dr .showProperties {
101
102
res := ""
102
- for _ , prop := range details .GetBuildProperties () {
103
+ for _ , prop := range details .BuildProperties {
103
104
res += fmt .Sprintln (prop )
104
105
}
105
106
return res
@@ -109,7 +110,10 @@ func (dr detailsResult) String() string {
109
110
t := table .New ()
110
111
t .AddRow (tr ("Id" ), tr ("Programmer name" ))
111
112
for _ , programmer := range details .Programmers {
112
- t .AddRow (programmer .GetId (), programmer .GetName ())
113
+ if programmer == nil {
114
+ continue
115
+ }
116
+ t .AddRow (programmer .Id , programmer .Name )
113
117
}
114
118
return t .Render ()
115
119
}
@@ -138,7 +142,7 @@ func (dr detailsResult) String() string {
138
142
t .AddRow (tr ("Board name:" ), details .Name )
139
143
t .AddRow (tr ("FQBN:" ), details .Fqbn )
140
144
addIfNotEmpty (tr ("Board version:" ), details .Version )
141
- if details .GetDebuggingSupported () {
145
+ if details .DebuggingSupported {
142
146
t .AddRow (tr ("Debugging supported:" ), table .NewCell ("✔" , color .New (color .FgGreen )))
143
147
}
144
148
@@ -148,11 +152,15 @@ func (dr detailsResult) String() string {
148
152
table .NewCell ("✔" , color .New (color .FgGreen )))
149
153
}
150
154
151
- for _ , idp := range details .GetIdentificationProperties () {
155
+ for _ , idp := range details .IdentificationProperties {
156
+ if idp == nil || idp .Properties == nil {
157
+ continue
158
+ }
152
159
t .AddRow () // get some space from above
153
160
header := tr ("Identification properties:" )
154
- for k , v := range idp .GetProperties () {
155
- t .AddRow (header , k + "=" + v )
161
+ keys := idp .Properties .Keys ()
162
+ for _ , k := range keys {
163
+ t .AddRow (header , k + "=" + idp .Properties .Get (k ))
156
164
header = ""
157
165
}
158
166
}
@@ -213,7 +221,10 @@ func (dr detailsResult) String() string {
213
221
214
222
tab .AddRow (tr ("Programmers:" ), tr ("ID" ), tr ("Name" ))
215
223
for _ , programmer := range details .Programmers {
216
- tab .AddRow ("" , programmer .GetId (), programmer .GetName ())
224
+ if programmer == nil {
225
+ continue
226
+ }
227
+ tab .AddRow ("" , programmer .Id , programmer .Name )
217
228
}
218
229
219
230
return t .Render () + tab .Render ()
0 commit comments