Core search/list now return boards in a platform (#268)

Signed-off-by: Christian Weichel <christian.weichel@typefox.io>

cli/core/list.go

@@ -69,7 +69,7 @@ func runListCommand(cmd *cobra.Command, args []string) {
 	}
 }
 
-func outputInstalledCores(cores []*rpc.InstalledPlatform) {
+func outputInstalledCores(cores []*rpc.Platform) {
 	table := output.NewTable()
 	table.AddRow("ID", "Installed", "Latest", "Name")
 	sort.Slice(cores, func(i, j int) bool {

cli/core/search.go

@@ -71,14 +71,14 @@ func runSearchCommand(cmd *cobra.Command, args []string) {
 	}
 }
 
-func outputSearchCores(cores []*rpc.SearchOutput) {
+func outputSearchCores(cores []*rpc.Platform) {
 	table := output.NewTable()
 	table.AddRow("ID", "Version", "Name")
 	sort.Slice(cores, func(i, j int) bool {
 		return cores[i].ID < cores[j].ID
 	})
 	for _, item := range cores {
-		table.AddRow(item.GetID(), item.GetVersion(), item.GetName())
+		table.AddRow(item.GetID(), item.GetLatest(), item.GetName())
 	}
 	fmt.Print(table.Render())
 }

commands/core/core.go

+/*
+ * This file is part of arduino-cli.
+ *
+ * Copyright 2019 ARDUINO SA (http://www.arduino.cc/)
+ *
+ * This software is released under the GNU General Public License version 3,
+ * which covers the main part of arduino-cli.
+ * The terms of this license can be found at:
+ * https://www.gnu.org/licenses/gpl-3.0.en.html
+ *
+ * You can be released from the requirements of the above licenses by purchasing
+ * a commercial license. Buying such a license is mandatory if you want to modify or
+ * otherwise use the software for commercial activities involving the Arduino
+ * software without disclosing the source code of your own applications. To purchase
+ * a commercial license, send an email to license@arduino.cc.
+ */
+
+package core
+
+import (
+	"github.com/arduino/arduino-cli/arduino/cores"
+	rpc "github.com/arduino/arduino-cli/rpc/commands"
+)
+
+// platformReleaseToRPC converts our internal structure to the RPC structure.
+// Note: this function does not touch the "Installed" field of rpc.Platform as it's not always clear that the
+// platformRelease we're currently converting is actually installed.
+func platformReleaseToRPC(platformRelease *cores.PlatformRelease) *rpc.Platform {
+	boards := make([]*rpc.Board, len(platformRelease.Boards))
+	i := 0
+	for _, b := range platformRelease.Boards {
+		boards[i] = &rpc.Board{
+			Name: b.Name(),
+			Fqbn: b.FQBN(),
+		}
+		i++
+	}
+
+	result := &rpc.Platform{
+		ID:         platformRelease.Platform.String(),
+		Name:       platformRelease.Platform.Name,
+		Maintainer: platformRelease.Platform.Package.Maintainer,
+		Website:    platformRelease.Platform.Package.WebsiteURL,
+		Email:      platformRelease.Platform.Package.Email,
+		Boards:     boards,
+	}
+
+	latest := platformRelease.Platform.GetLatestRelease()
+	if latest != nil {
+		result.Latest = latest.Version.String()
+	}
+
+	return result
+}

commands/core/list.go

@@ -32,7 +32,7 @@ func PlatformList(ctx context.Context, req *rpc.PlatformListReq) (*rpc.PlatformL
 		return nil, errors.New("invalid instance")
 	}
 
-	installed := []*rpc.InstalledPlatform{}
+	installed := []*rpc.Platform{}
 	for _, targetPackage := range pm.GetPackages().Packages {
 		for _, platform := range targetPackage.Platforms {
 			if platformRelease := pm.GetInstalledPlatformRelease(platform); platformRelease != nil {
@@ -41,14 +41,9 @@ func PlatformList(ctx context.Context, req *rpc.PlatformListReq) (*rpc.PlatformL
 						continue
 					}
 				}
-				p := &rpc.InstalledPlatform{
-					ID:        platformRelease.String(),
-					Installed: platformRelease.Version.String(),
-					Name:      platformRelease.Platform.Name,
-				}
-				if latest := platformRelease.Platform.GetLatestRelease(); latest != nil {
-					p.Latest = latest.Version.String()
-				}
+
+				p := platformReleaseToRPC(platformRelease)
+				p.Installed = platformRelease.Version.String()
 				installed = append(installed, p)
 			}
 		}

commands/core/search.go

@@ -65,13 +65,9 @@ func PlatformSearch(ctx context.Context, req *rpc.PlatformSearchReq) (*rpc.Platf
 		}
 	}
 
-	out := []*rpc.SearchOutput{}
-	for _, platformRelease := range res {
-		out = append(out, &rpc.SearchOutput{
-			ID:      platformRelease.Platform.String(),
-			Name:    platformRelease.Platform.Name,
-			Version: platformRelease.Version.String(),
-		})
+	out := make([]*rpc.Platform, len(res))
+	for i, platformRelease := range res {
+		out[i] = platformReleaseToRPC(platformRelease)
 	}
 	return &rpc.PlatformSearchResp{SearchOutput: out}, nil
 }

rpc/commands/core.proto

@@ -73,13 +73,7 @@ message PlatformSearchReq {
 }
 
 message PlatformSearchResp {
-	repeated SearchOutput search_output = 1;
-}
-
-message SearchOutput {
-	string ID = 1;
-	string Version = 2;
-	string Name = 3;
+	repeated Platform search_output = 1;
 }
 
 message PlatformListReq {
@@ -88,12 +82,21 @@ message PlatformListReq {
 }
 
 message PlatformListResp {
-	repeated InstalledPlatform installed_platform = 1;
+	repeated Platform installed_platform = 1;
 }
 
-message InstalledPlatform {
+message Platform {
 	string ID = 1;
 	string Installed = 2;
 	string Latest = 3;
 	string Name = 4;
+	string Maintainer = 5;
+	string Website = 6;
+	string Email = 7;
+	repeated Board Boards = 8;
 }
+
+message Board {
+	string name = 1;
+	string fqbn = 2;
+}
\ No newline at end of file