Implemented board list with discoveries

Author: cmaglie

arduino/discovery/discoverymanager/discoverymanager.go

@@ -43,16 +43,22 @@ func (dm *DiscoveryManager) Add(disc *discovery.PluggableDiscovery) error {
 	return nil
 }
 
-// StartAll the discoveries for this DiscoveryManager,
+// RunAll the discoveries for this DiscoveryManager,
 // returns the first error it meets or nil
-func (dm *DiscoveryManager) StartAll() error {
+func (dm *DiscoveryManager) RunAll() error {
 	for _, d := range dm.discoveries {
-		err := d.Start()
-		if err != nil {
+		if err := d.Run(); err != nil {
 			return err
 		}
-		err = d.StartSync()
-		if err != nil {
+	}
+	return nil
+}
+
+// StartAll the discoveries for this DiscoveryManager,
+// returns the first error it meets or nil
+func (dm *DiscoveryManager) StartAll() error {
+	for _, d := range dm.discoveries {
+		if err := d.Start(); err != nil {
 			return err
 		}
 	}
@@ -71,29 +77,20 @@ func (dm *DiscoveryManager) StopAll() error {
 	return nil
 }
 
-// ListPorts return the current list of ports detected from all discoveries
-func (dm *DiscoveryManager) ListPorts() []*discovery.Port {
-	// c := make(chan []*discovery.Port, len(dm.discoveries))
-
-	// var wg sync.WaitGroup
-	// for _, d := range dm.discoveries {
-	// 	wg.Add(1)
-	// 	d := d
-	// 	go func() {
-	// 		c <- d.ListSync()
-	// 		wg.Done()
-	// 	}()
-	// }
-	// wg.Wait()
-	// // Close the channel only after all the goroutines are finished
-	// close(c)
-
-	// ports := []*discovery.Port{}
-	// for p := range c {
-	// 	ports = append(ports, p...)
-	// }
+func (dm *DiscoveryManager) List() []*discovery.Port {
+	res := []*discovery.Port{}
+	for _, disc := range dm.discoveries {
+		l, err := disc.List()
+		if err != nil {
+			continue
+		}
+		res = append(res, l...)
+	}
+	return res
+}
 
-	// return ports
+// ListPorts return the current list of ports detected from all discoveries
+func (dm *DiscoveryManager) ListSync() []*discovery.Port {
 	res := []*discovery.Port{}
 	for _, disc := range dm.discoveries {
 		res = append(res, disc.ListSync()...)

commands/board/list.go

@@ -193,10 +193,13 @@ func List(instanceID int32) (r []*rpc.DetectedPort, e error) {
 		return nil, errors.New("invalid instance")
 	}
 
-	ports, err := commands.ListBoards(pm)
-	if err != nil {
-		return nil, errors.Wrap(err, "error getting port list from serial-discovery")
+	if err := pm.DiscoveryManager().RunAll(); err != nil {
+		return nil, err
+	}
+	if err := pm.DiscoveryManager().StartAll(); err != nil {
+		return nil, err
 	}
+	ports := pm.DiscoveryManager().List()
 
 	retVal := []*rpc.DetectedPort{}
 	for _, port := range ports {

commands/bundled_tools_serial_discovery.go

@@ -17,7 +17,6 @@ package commands
 
 import (
 	"fmt"
-	"sync"
 
 	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
@@ -102,45 +101,6 @@ var (
 	}
 )
 
-var listBoardMutex sync.Mutex
-
-// ListBoards foo
-func ListBoards(pm *packagemanager.PackageManager) ([]*discovery.Port, error) {
-	// ensure the connection to the discoverer is unique to avoid messing up
-	// the messages exchanged
-	listBoardMutex.Lock()
-	defer listBoardMutex.Unlock()
-
-	// get the bundled tool
-	t := getBuiltinSerialDiscoveryTool(pm)
-
-	// determine if it's installed
-	if !t.IsInstalled() {
-		return nil, fmt.Errorf("missing serial-discovery tool")
-	}
-
-	disc, err := discovery.New("serial-discovery", t.InstallDir.Join(t.Tool.Name).String())
-	if err != nil {
-		return nil, err
-	}
-	defer disc.Quit()
-
-	if err = disc.Run(); err != nil {
-		return nil, fmt.Errorf("starting discovery: %v", err)
-	}
-
-	if err = disc.Start(); err != nil {
-		return nil, fmt.Errorf("starting discovery: %v", err)
-	}
-
-	res, err := disc.List()
-	if err != nil {
-		return nil, fmt.Errorf("getting port list from discovery: %v", err)
-	}
-
-	return res, nil
-}
-
 // WatchListBoards returns a channel that receives events from the bundled discovery tool
 func WatchListBoards(pm *packagemanager.PackageManager) (<-chan *discovery.Event, error) {
 	t := getBuiltinSerialDiscoveryTool(pm)