@@ -29,6 +29,7 @@ import (
29
29
"github.com/arduino/arduino-cli/commands/core"
30
30
"github.com/arduino/arduino-cli/configuration"
31
31
"github.com/arduino/arduino-cli/internal/cli/feedback"
32
+ "github.com/arduino/arduino-cli/internal/cli/feedback/result"
32
33
"github.com/arduino/arduino-cli/internal/cli/instance"
33
34
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
34
35
"github.com/arduino/arduino-cli/table"
@@ -81,13 +82,21 @@ func runSearchCommand(cmd *cobra.Command, args []string) {
81
82
}
82
83
83
84
coreslist := resp .GetSearchOutput ()
84
- feedback .PrintResult (searchResults { coreslist } )
85
+ feedback .PrintResult (newSearchResult ( coreslist ) )
85
86
}
86
87
87
88
// output from this command requires special formatting, let's create a dedicated
88
89
// feedback.Result implementation
89
90
type searchResults struct {
90
- platforms []* rpc.PlatformSummary
91
+ platforms []* result.Platform
92
+ }
93
+
94
+ func newSearchResult (in []* rpc.PlatformSummary ) * searchResults {
95
+ res := & searchResults {}
96
+ for _ , platformSummary := range in {
97
+ res .platforms = append (res .platforms , result .NewPlatformResult (platformSummary ))
98
+ }
99
+ return res
91
100
}
92
101
93
102
func (sr searchResults ) Data () interface {} {
@@ -99,12 +108,15 @@ func (sr searchResults) String() string {
99
108
t := table .New ()
100
109
t .SetHeader (tr ("ID" ), tr ("Version" ), tr ("Name" ))
101
110
for _ , platform := range sr .platforms {
102
- name := platform .GetLatestRelease ().GetName ()
103
- if platform .GetMetadata ().Deprecated {
111
+ name := ""
112
+ if latest := platform .GetLatestRelease (); latest != nil {
113
+ name = latest .Name
114
+ }
115
+ if platform .Deprecated {
104
116
name = fmt .Sprintf ("[%s] %s" , tr ("DEPRECATED" ), name )
105
117
}
106
- for _ , platformRelease := range platform .GetSortedReleases () {
107
- t .AddRow (platform .GetMetadata (). GetId (), platformRelease . GetVersion () , name )
118
+ for _ , version := range platform .Releases . Keys () {
119
+ t .AddRow (platform .Id , version , name )
108
120
}
109
121
}
110
122
return t .Render ()
0 commit comments