clean up plugglable discovery and refactor serial-discovery usage (#327)

arduino · Aug 8, 2019 · 7e547b0 · 7e547b0
1 parent a57cf78
commit 7e547b0
Show file tree

Hide file tree

Showing 17 changed files with 190 additions and 356 deletions.
diff --git a/arduino/discovery/discovery.go b/arduino/discovery/discovery.go
diff --git a/cli/board/list.go b/cli/board/list.go
@@ -18,7 +18,6 @@
 package board
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"sort"
@@ -61,7 +60,7 @@ func runListCommand(cmd *cobra.Command, args []string) {
 		time.Sleep(timeout)
 	}
 
-	resp, err := board.List(context.Background(), &rpc.BoardListReq{Instance: instance.CreateInstance()})
+	resp, err := board.List(instance.CreateInstance().GetId())
 	if err != nil {
 		formatter.PrintError(err, "Error detecting boards")
 		os.Exit(errorcodes.ErrNetwork)

diff --git a/commands/board/attach.go b/commands/board/attach.go
@@ -37,7 +37,7 @@ import (
 // Attach FIXMEDOC
 func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskProgressCB) (*rpc.BoardAttachResp, error) {
 
-	pm := commands.GetPackageManager(req)
+	pm := commands.GetPackageManager(req.GetInstance().GetId())
 	if pm == nil {
 		return nil, errors.New("invalid instance")
 	}

diff --git a/commands/board/details.go b/commands/board/details.go
@@ -29,7 +29,7 @@ import (
 
 // Details FIXMEDOC
 func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
-	pm := commands.GetPackageManager(req)
+	pm := commands.GetPackageManager(req.GetInstance().GetId())
 	if pm == nil {
 		return nil, errors.New("invalid instance")
 	}

diff --git a/commands/board/list.go b/commands/board/list.go
@@ -18,44 +18,50 @@
 package board
 
 import (
-	"context"
-	"errors"
-	"fmt"
-
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
+	"github.com/pkg/errors"
 )
 
 // List FIXMEDOC
-func List(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
-	pm := commands.GetPackageManager(req)
+func List(instanceID int32) (*rpc.BoardListResp, error) {
+	pm := commands.GetPackageManager(instanceID)
 	if pm == nil {
 		return nil, errors.New("invalid instance")
 	}
 
+	serialDiscovery, err := commands.NewBuiltinSerialDiscovery(pm)
+	if err != nil {
+		return nil, errors.Wrap(err, "unable to instance serial-discovery")
+	}
+
+	if err := serialDiscovery.Start(); err != nil {
+		return nil, errors.Wrap(err, "unable to start serial-discovery")
+	}
+	defer serialDiscovery.Close()
+
 	resp := &rpc.BoardListResp{Ports: []*rpc.DetectedPort{}}
-	for _, disc := range commands.GetDiscoveries(req) {
-		ports, err := disc.List()
-		if err != nil {
-			fmt.Printf("Error getting port list from discovery %s: %s\n", disc.ID, err)
-			continue
+
+	ports, err := serialDiscovery.List()
+	if err != nil {
+		return nil, errors.Wrap(err, "error getting port list from serial-discovery")
+	}
+
+	for _, port := range ports {
+		b := []*rpc.BoardListItem{}
+		for _, board := range pm.IdentifyBoard(port.IdentificationPrefs) {
+			b = append(b, &rpc.BoardListItem{
+				Name: board.Name(),
+				FQBN: board.FQBN(),
+			})
 		}
-		for _, port := range ports {
-			b := []*rpc.BoardListItem{}
-			for _, board := range pm.IdentifyBoard(port.IdentificationPrefs) {
-				b = append(b, &rpc.BoardListItem{
-					Name: board.Name(),
-					FQBN: board.FQBN(),
-				})
-			}
-			p := &rpc.DetectedPort{
-				Address:       port.Address,
-				Protocol:      port.Protocol,
-				ProtocolLabel: port.ProtocolLabel,
-				Boards:        b,
-			}
-			resp.Ports = append(resp.Ports, p)
+		p := &rpc.DetectedPort{
+			Address:       port.Address,
+			Protocol:      port.Protocol,
+			ProtocolLabel: port.ProtocolLabel,
+			Boards:        b,
 		}
+		resp.Ports = append(resp.Ports, p)
 	}
 
 	return resp, nil

diff --git a/commands/board/listall.go b/commands/board/listall.go
@@ -28,7 +28,7 @@ import (
 
 // ListAll FIXMEDOC
 func ListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
-	pm := commands.GetPackageManager(req)
+	pm := commands.GetPackageManager(req.GetInstance().GetId())
 	if pm == nil {
 		return nil, errors.New("invalid instance")
 	}