Skip to content

Commit faa33bd

Browse files
committed
cosmetic: added shortcut variable for package manager; small readability improvement
1 parent e1d2679 commit faa33bd

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

commands/instances.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,8 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
214214
// after reinitializing an instance after installing or uninstalling a core.
215215
// If this is not done the information of the uninstall core is kept in memory,
216216
// even if it should not.
217-
instance.PackageManager.Clear()
217+
pm := instance.PackageManager
218+
pm.Clear()
218219

219220
// Load Platforms
220221
urls := []string{globals.DefaultIndexURL}
@@ -230,15 +231,15 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
230231
if URL.Scheme == "file" {
231232
indexFile := paths.New(URL.Path)
232233

233-
_, err := instance.PackageManager.LoadPackageIndexFromFile(indexFile)
234+
_, err := pm.LoadPackageIndexFromFile(indexFile)
234235
if err != nil {
235236
s := status.Newf(codes.FailedPrecondition, tr("Loading index file: %v"), err)
236237
responseError(s)
237238
}
238239
continue
239240
}
240241

241-
if err := instance.PackageManager.LoadPackageIndex(URL); err != nil {
242+
if err := pm.LoadPackageIndex(URL); err != nil {
242243
s := status.Newf(codes.FailedPrecondition, tr("Loading index file: %v"), err)
243244
responseError(s)
244245
}
@@ -247,14 +248,14 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
247248
// We load hardware before verifying builtin tools are installed
248249
// otherwise we wouldn't find them and reinstall them each time
249250
// and they would never get reloaded.
250-
for _, err := range instance.PackageManager.LoadHardware() {
251+
for _, err := range pm.LoadHardware() {
251252
s := &arduino.PlatformLoadingError{Cause: err}
252253
responseError(s.ToRPCStatus())
253254
}
254255

255256
// Get builtin tools
256257
builtinToolReleases := []*cores.ToolRelease{}
257-
for name, tool := range instance.PackageManager.Packages.GetOrCreatePackage("builtin").Tools {
258+
for name, tool := range pm.Packages.GetOrCreatePackage("builtin").Tools {
258259
latestRelease := tool.LatestRelease()
259260
if latestRelease == nil {
260261
s := status.Newf(codes.Internal, tr("can't find latest release of tool %s", name))
@@ -264,8 +265,8 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
264265
builtinToolReleases = append(builtinToolReleases, latestRelease)
265266
}
266267

267-
toolsHaveBeenInstalled := false
268268
// Install tools if necessary
269+
toolsHaveBeenInstalled := false
269270
for _, toolRelease := range builtinToolReleases {
270271
installed, err := instance.installToolIfMissing(toolRelease, downloadCallback, taskCallback)
271272
if err != nil {
@@ -279,23 +280,23 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
279280
if toolsHaveBeenInstalled {
280281
// We installed at least one new tool after loading hardware
281282
// so we must reload again otherwise we would never found them.
282-
for _, err := range instance.PackageManager.LoadHardware() {
283+
for _, err := range pm.LoadHardware() {
283284
s := &arduino.PlatformLoadingError{Cause: err}
284285
responseError(s.ToRPCStatus())
285286
}
286287
}
287288

288-
for _, err := range instance.PackageManager.LoadDiscoveries() {
289+
for _, err := range pm.LoadDiscoveries() {
289290
s := &arduino.PlatformLoadingError{Cause: err}
290291
responseError(s.ToRPCStatus())
291292
}
292293

293294
lm := instance.lm
294295

295296
// Load libraries
296-
for _, pack := range instance.PackageManager.Packages {
297+
for _, pack := range pm.Packages {
297298
for _, platform := range pack.Platforms {
298-
if platformRelease := instance.PackageManager.GetInstalledPlatformRelease(platform); platformRelease != nil {
299+
if platformRelease := pm.GetInstalledPlatformRelease(platform); platformRelease != nil {
299300
lm.AddPlatformReleaseLibrariesDir(platformRelease, libraries.PlatformBuiltIn)
300301
}
301302
}

0 commit comments

Comments
 (0)