Implemented BoardListAll grpc method

Author: cmaglie

cli/board/listall.go

@@ -18,12 +18,16 @@
 package board
 
 import (
+	"context"
+	"fmt"
+	"os"
 	"sort"
-	"strings"
 
 	"github.com/arduino/arduino-cli/cli"
+	"github.com/arduino/arduino-cli/commands/board"
 	"github.com/arduino/arduino-cli/common/formatter"
-	"github.com/arduino/arduino-cli/common/formatter/output"
+	"github.com/arduino/arduino-cli/output"
+	"github.com/arduino/arduino-cli/rpc"
 	"github.com/spf13/cobra"
 )
 
@@ -45,36 +49,30 @@ func initListAllCommand() *cobra.Command {
 
 // runListAllCommand list all installed boards
 func runListAllCommand(cmd *cobra.Command, args []string) {
-	pm, _ := cli.InitPackageAndLibraryManager()
+	instance := cli.CreateInstance()
 
-	match := func(name string) bool {
-		name = strings.ToLower(name)
-		for _, term := range args {
-			if !strings.Contains(name, strings.ToLower(term)) {
-				return false
-			}
-		}
-		return true
+	list, err := board.BoardListAll(context.Background(), &rpc.BoardListAllReq{
+		Instance:   instance,
+		SearchArgs: args,
+	})
+	if err != nil {
+		formatter.PrintError(err, "Error listing boards")
+		os.Exit(cli.ErrGeneric)
 	}
+	if cli.OutputJSONOrElse(list) {
+		outputBoardListAll(list)
+	}
+}
+
+func outputBoardListAll(list *rpc.BoardListAllResp) {
+	sort.Slice(list.Boards, func(i, j int) bool {
+		return list.Boards[i].GetName() < list.Boards[j].GetName()
+	})
 
-	list := &output.BoardList{}
-	for _, targetPackage := range pm.GetPackages().Packages {
-		for _, platform := range targetPackage.Platforms {
-			platformRelease := pm.GetInstalledPlatformRelease(platform)
-			if platformRelease == nil {
-				continue
-			}
-			for _, board := range platformRelease.Boards {
-				if !match(board.Name()) {
-					continue
-				}
-				list.Boards = append(list.Boards, &output.BoardListItem{
-					Name: board.Name(),
-					Fqbn: board.FQBN(),
-				})
-			}
-		}
+	table := output.NewTable()
+	table.SetHeader("Board Name", "FQBN")
+	for _, item := range list.GetBoards() {
+		table.AddRow(item.GetName(), item.GetFQBN())
 	}
-	sort.Sort(list)
-	formatter.Print(list)
+	fmt.Print(table.Render())
 }

commands/board/list.go

@@ -40,9 +40,9 @@ func BoardList(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp,
 			continue
 		}
 		for _, port := range ports {
-			b := []*rpc.DetectedBoard{}
+			b := []*rpc.BoardListItem{}
 			for _, board := range pm.IdentifyBoard(port.IdentificationPrefs) {
-				b = append(b, &rpc.DetectedBoard{
+				b = append(b, &rpc.BoardListItem{
 					Name: board.Name(),
 					FQBN: board.FQBN(),
 				})

commands/board/listall.go

@@ -0,0 +1,69 @@
+/*
+ * This file is part of arduino-cli.
+ *
+ * Copyright 2018 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 [email protected].
+ */
+
+package board
+
+import (
+	"context"
+	"errors"
+	"strings"
+
+	"github.com/arduino/arduino-cli/commands"
+	"github.com/arduino/arduino-cli/rpc"
+)
+
+func BoardListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
+	pm := commands.GetPackageManager(req)
+	if pm == nil {
+		return nil, errors.New("invalid instance")
+	}
+
+	args := req.GetSearchArgs()
+	match := func(name string) bool {
+		if len(args) == 0 {
+			return true
+		}
+		name = strings.ToLower(name)
+		for _, term := range args {
+			if !strings.Contains(name, strings.ToLower(term)) {
+				return false
+			}
+		}
+		return true
+	}
+
+	list := &rpc.BoardListAllResp{Boards: []*rpc.BoardListItem{}}
+	for _, targetPackage := range pm.GetPackages().Packages {
+		for _, platform := range targetPackage.Platforms {
+			platformRelease := pm.GetInstalledPlatformRelease(platform)
+			if platformRelease == nil {
+				continue
+			}
+			for _, board := range platformRelease.Boards {
+				if !match(board.Name()) {
+					continue
+				}
+				list.Boards = append(list.Boards, &rpc.BoardListItem{
+					Name: board.Name(),
+					FQBN: board.FQBN(),
+				})
+			}
+		}
+	}
+
+	return list, nil
+}

common/formatter/output/board_structs.go

@@ -58,38 +58,3 @@ func (bl *AttachedBoardList) String() string {
 	}
 	return fmt.Sprintln(table)
 }
-
-// BoardListItem is a supported board
-type BoardListItem struct {
-	Name string `json:"name,required"`
-	Fqbn string `json:"fqbn,required"`
-}
-
-// BoardList is a list of supported boards
-type BoardList struct {
-	Boards []*BoardListItem `json:"boards,required"`
-}
-
-func (bl *BoardList) String() string {
-	table := uitable.New()
-	table.MaxColWidth = 100
-	table.Wrap = true // wrap columns
-
-	table.AddRow("Board Name", "FQBN")
-	for _, item := range bl.Boards {
-		table.AddRow(item.Name, item.Fqbn)
-	}
-	return fmt.Sprintln(table)
-}
-
-func (bl *BoardList) Len() int {
-	return len(bl.Boards)
-}
-
-func (bl *BoardList) Less(i, j int) bool {
-	return bl.Boards[i].Name < bl.Boards[j].Name
-}
-
-func (bl *BoardList) Swap(i, j int) {
-	bl.Boards[i], bl.Boards[j] = bl.Boards[j], bl.Boards[i]
-}

daemon/daemon.go

@@ -64,6 +64,10 @@ func (s *ArduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardLis
 	return board.BoardList(ctx, req)
 }
 
+func (s *ArduinoCoreServerImpl) BoardListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
+	return board.BoardListAll(ctx, req)
+}
+
 func (s *ArduinoCoreServerImpl) BoardAttach(req *rpc.BoardAttachReq, stream rpc.ArduinoCore_BoardAttachServer) error {
 
 	resp, err := board.BoardAttach(stream.Context(), req,