refactor: pr comments

Author: Bikappa

arduino/cores/packagemanager/package_manager.go

@@ -98,6 +98,7 @@ func (pmb *Builder) BuildIntoExistingPackageManager(target *PackageManager) {
 	} else {
 		target.discoveryManager = pmb.discoveryManager
 	}
+	target.discoveryManager.AddAllDiscoveriesFrom(pmb.discoveryManager)
 	target.userAgent = pmb.userAgent
 }
 

arduino/discovery/discoverymanager/discoverymanager.go

@@ -65,15 +65,9 @@ func (dm *DiscoveryManager) Clear() {
 			logrus.Infof("Closed and removed discovery %s", d.GetID())
 		}
 	}
-	dm.discoveriesRunning = false
 	dm.discoveries = map[string]*discovery.PluggableDiscovery{}
 }
 
-// AreDiscoveriesRunning returns a boolean representing the running status of discoveries
-func (dm *DiscoveryManager) AreDiscoveriesRunning() bool {
-	return dm.discoveriesRunning
-}
-
 // IDs returns the list of discoveries' ids in this DiscoveryManager
 func (dm *DiscoveryManager) IDs() []string {
 	ids := []string{}
@@ -283,3 +277,13 @@ func (dm *DiscoveryManager) List() []*discovery.Port {
 	}
 	return res
 }
+
+func (dm *DiscoveryManager) AddAllDiscoveriesFrom(src *DiscoveryManager) {
+	for id, d := range src.discoveries {
+		dm.discoveries[id] = d
+	}
+
+	if src.discoveriesRunning {
+		dm.Start()
+	}
+}

commands/instances.go

@@ -261,7 +261,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 			},
 		})
 	}
-	var shouldRestartDiscovery bool
+
 	{
 		// We need to rebuild the PackageManager currently in use by this instance
 		// in case this is not the first Init on this instances, that might happen
@@ -271,7 +271,6 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 
 		// register whether the discoveries are running, if so we need to start them in
 		// order for the previous watchers to keep receiving events
-		shouldRestartDiscovery = areDiscoveriesRunning(instance.pm)
 		pmb, commitPackageManager := instance.pm.NewBuilder()
 
 		loadBuiltinTools := func() []error {
@@ -467,9 +466,6 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 		responseError(s)
 	}
 
-	if shouldRestartDiscovery {
-		pme.DiscoveryManager().Start()
-	}
 	// Refreshes the locale used, this will change the
 	// language of the CLI if the locale is different
 	// after started.
@@ -478,19 +474,6 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 	return nil
 }
 
-func areDiscoveriesRunning(pm *packagemanager.PackageManager) bool {
-	if pm == nil {
-		return false
-	}
-	exp, release := pm.NewExplorer()
-	defer release()
-
-	if exp.DiscoveryManager() != nil && exp.DiscoveryManager().AreDiscoveriesRunning() {
-		return true
-	}
-	return false
-}
-
 // Destroy FIXMEDOC
 func Destroy(ctx context.Context, req *rpc.DestroyRequest) (*rpc.DestroyResponse, error) {
 	if ok := instances.RemoveID(req.GetInstance().GetId()); !ok {