Now GetLibraryManager accepts an rpc.InstanceCommand

cmaglie · cmaglie · commit dbd6b0191e34 · 2022-08-23T12:31:38.000+02:00
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -63,7 +63,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	}
 	defer release()
 
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/daemon/daemon.go b/commands/daemon/daemon.go
@@ -436,7 +436,7 @@ func (s *ArduinoCoreServerImpl) LibraryUninstall(req *rpc.LibraryUninstallReques
 
 // LibraryUpgradeAll FIXMEDOC
 func (s *ArduinoCoreServerImpl) LibraryUpgradeAll(req *rpc.LibraryUpgradeAllRequest, stream rpc.ArduinoCoreService_LibraryUpgradeAllServer) error {
-	err := lib.LibraryUpgradeAll(req.GetInstance().GetId(),
+	err := lib.LibraryUpgradeAll(req,
 		func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryUpgradeAllResponse{Progress: p}) },
 		func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUpgradeAllResponse{TaskProgress: p}) },
 	)
diff --git a/commands/instances.go b/commands/instances.go
@@ -121,9 +121,9 @@ func GetPackageManagerExplorer(req rpc.InstanceCommand) (explorer *packagemanage
 	return pm.NewExplorer()
 }
 
-// GetLibraryManager returns the library manager for the given instance ID
-func GetLibraryManager(id int32) *librariesmanager.LibrariesManager {
-	i := instances.GetInstance(id)
+// GetLibraryManager returns the library manager for the given instance.
+func GetLibraryManager(req rpc.InstanceCommand) *librariesmanager.LibrariesManager {
+	i := instances.GetInstance(req.GetInstance().GetId())
 	if i == nil {
 		return nil
 	}
@@ -467,7 +467,7 @@ func Destroy(ctx context.Context, req *rpc.DestroyRequest) (*rpc.DestroyResponse
 // UpdateLibrariesIndex updates the library_index.json
 func UpdateLibrariesIndex(ctx context.Context, req *rpc.UpdateLibrariesIndexRequest, downloadCB rpc.DownloadProgressCB) error {
 	logrus.Info("Updating libraries index")
-	lm := GetLibraryManager(req.GetInstance().GetId())
+	lm := GetLibraryManager(req)
 	if lm == nil {
 		return &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/download.go b/commands/lib/download.go
@@ -34,7 +34,7 @@ var tr = i18n.Tr
 func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadRequest, downloadCB rpc.DownloadProgressCB) (*rpc.LibraryDownloadResponse, error) {
 	logrus.Info("Executing `arduino-cli lib download`")
 
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/install.go b/commands/lib/install.go
@@ -31,7 +31,7 @@ import (
 // LibraryInstall FIXMEDOC
 func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {
 
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if lm == nil {
 		return &arduino.InvalidInstanceError{}
 	}
@@ -148,19 +148,19 @@ func installLibrary(lm *librariesmanager.LibrariesManager, libRelease *libraries
 	return nil
 }
 
-//ZipLibraryInstall FIXMEDOC
+// ZipLibraryInstall FIXMEDOC
 func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallRequest, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if err := lm.InstallZipLib(ctx, req.Path, req.Overwrite); err != nil {
 		return &arduino.FailedLibraryInstallError{Cause: err}
 	}
 	taskCB(&rpc.TaskProgress{Message: tr("Library installed"), Completed: true})
 	return nil
 }
 
-//GitLibraryInstall FIXMEDOC
+// GitLibraryInstall FIXMEDOC
 func GitLibraryInstall(ctx context.Context, req *rpc.GitLibraryInstallRequest, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if err := lm.InstallGitLib(req.Url, req.Overwrite); err != nil {
 		return &arduino.FailedLibraryInstallError{Cause: err}
 	}
diff --git a/commands/lib/list.go b/commands/lib/list.go
@@ -41,7 +41,7 @@ func LibraryList(ctx context.Context, req *rpc.LibraryListRequest) (*rpc.Library
 	}
 	defer release()
 
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/resolve_deps.go b/commands/lib/resolve_deps.go
@@ -27,7 +27,7 @@ import (
 
 // LibraryResolveDependencies FIXMEDOC
 func LibraryResolveDependencies(ctx context.Context, req *rpc.LibraryResolveDependenciesRequest) (*rpc.LibraryResolveDependenciesResponse, error) {
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/search.go b/commands/lib/search.go
@@ -29,7 +29,7 @@ import (
 
 // LibrarySearch FIXMEDOC
 func LibrarySearch(ctx context.Context, req *rpc.LibrarySearchRequest) (*rpc.LibrarySearchResponse, error) {
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	if lm == nil {
 		return nil, &arduino.InvalidInstanceError{}
 	}
diff --git a/commands/lib/uninstall.go b/commands/lib/uninstall.go
@@ -25,7 +25,7 @@ import (
 
 // LibraryUninstall FIXMEDOC
 func LibraryUninstall(ctx context.Context, req *rpc.LibraryUninstallRequest, taskCB rpc.TaskProgressCB) error {
-	lm := commands.GetLibraryManager(req.GetInstance().GetId())
+	lm := commands.GetLibraryManager(req)
 	ref, err := createLibIndexReference(lm, req)
 	if err != nil {
 		return &arduino.InvalidLibraryError{Cause: err}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream`
`63`	`63`	`}`
`64`	`64`	`defer release()`
`65`	`65`
`66`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`66`	`+ lm := commands.GetLibraryManager(req)`
`67`	`67`	`if lm == nil {`
`68`	`68`	`return nil, &arduino.InvalidInstanceError{}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ func (s ArduinoCoreServerImpl) LibraryUninstall(req rpc.LibraryUninstallReques`
`436`	`436`
`437`	`437`	`// LibraryUpgradeAll FIXMEDOC`
`438`	`438`	`func (s ArduinoCoreServerImpl) LibraryUpgradeAll(req rpc.LibraryUpgradeAllRequest, stream rpc.ArduinoCoreService_LibraryUpgradeAllServer) error {`
`439`		`- err := lib.LibraryUpgradeAll(req.GetInstance().GetId(),`
	`439`	`+ err := lib.LibraryUpgradeAll(req,`
`440`	`440`	`func(p *rpc.DownloadProgress) { stream.Send(&rpc.LibraryUpgradeAllResponse{Progress: p}) },`
`441`	`441`	`func(p *rpc.TaskProgress) { stream.Send(&rpc.LibraryUpgradeAllResponse{TaskProgress: p}) },`
`442`	`442`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ var tr = i18n.Tr`
`34`	`34`	`func LibraryDownload(ctx context.Context, req rpc.LibraryDownloadRequest, downloadCB rpc.DownloadProgressCB) (rpc.LibraryDownloadResponse, error) {`
`35`	`35`	logrus.Info("Executing `arduino-cli lib download`")
`36`	`36`
`37`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`37`	`+ lm := commands.GetLibraryManager(req)`
`38`	`38`	`if lm == nil {`
`39`	`39`	`return nil, &arduino.InvalidInstanceError{}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`// LibraryInstall FIXMEDOC`
`32`	`32`	`func LibraryInstall(ctx context.Context, req *rpc.LibraryInstallRequest, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB) error {`
`33`	`33`
`34`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`34`	`+ lm := commands.GetLibraryManager(req)`
`35`	`35`	`if lm == nil {`
`36`	`36`	`return &arduino.InvalidInstanceError{}`
`37`	`37`	`}`
`@@ -148,19 +148,19 @@ func installLibrary(lm librariesmanager.LibrariesManager, libRelease libraries`
`148`	`148`	`return nil`
`149`	`149`	`}`
`150`	`150`
`151`		`-//ZipLibraryInstall FIXMEDOC`
	`151`	`+// ZipLibraryInstall FIXMEDOC`
`152`	`152`	`func ZipLibraryInstall(ctx context.Context, req *rpc.ZipLibraryInstallRequest, taskCB rpc.TaskProgressCB) error {`
`153`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`153`	`+ lm := commands.GetLibraryManager(req)`
`154`	`154`	`if err := lm.InstallZipLib(ctx, req.Path, req.Overwrite); err != nil {`
`155`	`155`	`return &arduino.FailedLibraryInstallError{Cause: err}`
`156`	`156`	`}`
`157`	`157`	`taskCB(&rpc.TaskProgress{Message: tr("Library installed"), Completed: true})`
`158`	`158`	`return nil`
`159`	`159`	`}`
`160`	`160`
`161`		`-//GitLibraryInstall FIXMEDOC`
	`161`	`+// GitLibraryInstall FIXMEDOC`
`162`	`162`	`func GitLibraryInstall(ctx context.Context, req *rpc.GitLibraryInstallRequest, taskCB rpc.TaskProgressCB) error {`
`163`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`163`	`+ lm := commands.GetLibraryManager(req)`
`164`	`164`	`if err := lm.InstallGitLib(req.Url, req.Overwrite); err != nil {`
`165`	`165`	`return &arduino.FailedLibraryInstallError{Cause: err}`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func LibraryList(ctx context.Context, req rpc.LibraryListRequest) (rpc.Library`
`41`	`41`	`}`
`42`	`42`	`defer release()`
`43`	`43`
`44`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`44`	`+ lm := commands.GetLibraryManager(req)`
`45`	`45`	`if lm == nil {`
`46`	`46`	`return nil, &arduino.InvalidInstanceError{}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`
`28`	`28`	`// LibraryResolveDependencies FIXMEDOC`
`29`	`29`	`func LibraryResolveDependencies(ctx context.Context, req rpc.LibraryResolveDependenciesRequest) (rpc.LibraryResolveDependenciesResponse, error) {`
`30`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`30`	`+ lm := commands.GetLibraryManager(req)`
`31`	`31`	`if lm == nil {`
`32`	`32`	`return nil, &arduino.InvalidInstanceError{}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`
`30`	`30`	`// LibrarySearch FIXMEDOC`
`31`	`31`	`func LibrarySearch(ctx context.Context, req rpc.LibrarySearchRequest) (rpc.LibrarySearchResponse, error) {`
`32`		`- lm := commands.GetLibraryManager(req.GetInstance().GetId())`
	`32`	`+ lm := commands.GetLibraryManager(req)`
`33`	`33`	`if lm == nil {`
`34`	`34`	`return nil, &arduino.InvalidInstanceError{}`
`35`	`35`	`}`