@@ -214,7 +214,8 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
214
214
// after reinitializing an instance after installing or uninstalling a core.
215
215
// If this is not done the information of the uninstall core is kept in memory,
216
216
// even if it should not.
217
- instance .PackageManager .Clear ()
217
+ pm := instance .PackageManager
218
+ pm .Clear ()
218
219
219
220
// Load Platforms
220
221
urls := []string {globals .DefaultIndexURL }
@@ -230,15 +231,15 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
230
231
if URL .Scheme == "file" {
231
232
indexFile := paths .New (URL .Path )
232
233
233
- _ , err := instance . PackageManager .LoadPackageIndexFromFile (indexFile )
234
+ _ , err := pm .LoadPackageIndexFromFile (indexFile )
234
235
if err != nil {
235
236
s := status .Newf (codes .FailedPrecondition , tr ("Loading index file: %v" ), err )
236
237
responseError (s )
237
238
}
238
239
continue
239
240
}
240
241
241
- if err := instance . PackageManager .LoadPackageIndex (URL ); err != nil {
242
+ if err := pm .LoadPackageIndex (URL ); err != nil {
242
243
s := status .Newf (codes .FailedPrecondition , tr ("Loading index file: %v" ), err )
243
244
responseError (s )
244
245
}
@@ -247,14 +248,14 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
247
248
// We load hardware before verifying builtin tools are installed
248
249
// otherwise we wouldn't find them and reinstall them each time
249
250
// and they would never get reloaded.
250
- for _ , err := range instance . PackageManager .LoadHardware () {
251
+ for _ , err := range pm .LoadHardware () {
251
252
s := & arduino.PlatformLoadingError {Cause : err }
252
253
responseError (s .ToRPCStatus ())
253
254
}
254
255
255
256
// Get builtin tools
256
257
builtinToolReleases := []* cores.ToolRelease {}
257
- for name , tool := range instance . PackageManager .Packages .GetOrCreatePackage ("builtin" ).Tools {
258
+ for name , tool := range pm .Packages .GetOrCreatePackage ("builtin" ).Tools {
258
259
latestRelease := tool .LatestRelease ()
259
260
if latestRelease == nil {
260
261
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
264
265
builtinToolReleases = append (builtinToolReleases , latestRelease )
265
266
}
266
267
267
- toolsHaveBeenInstalled := false
268
268
// Install tools if necessary
269
+ toolsHaveBeenInstalled := false
269
270
for _ , toolRelease := range builtinToolReleases {
270
271
installed , err := instance .installToolIfMissing (toolRelease , downloadCallback , taskCallback )
271
272
if err != nil {
@@ -279,23 +280,23 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
279
280
if toolsHaveBeenInstalled {
280
281
// We installed at least one new tool after loading hardware
281
282
// so we must reload again otherwise we would never found them.
282
- for _ , err := range instance . PackageManager .LoadHardware () {
283
+ for _ , err := range pm .LoadHardware () {
283
284
s := & arduino.PlatformLoadingError {Cause : err }
284
285
responseError (s .ToRPCStatus ())
285
286
}
286
287
}
287
288
288
- for _ , err := range instance . PackageManager .LoadDiscoveries () {
289
+ for _ , err := range pm .LoadDiscoveries () {
289
290
s := & arduino.PlatformLoadingError {Cause : err }
290
291
responseError (s .ToRPCStatus ())
291
292
}
292
293
293
294
lm := instance .lm
294
295
295
296
// Load libraries
296
- for _ , pack := range instance . PackageManager .Packages {
297
+ for _ , pack := range pm .Packages {
297
298
for _ , platform := range pack .Platforms {
298
- if platformRelease := instance . PackageManager .GetInstalledPlatformRelease (platform ); platformRelease != nil {
299
+ if platformRelease := pm .GetInstalledPlatformRelease (platform ); platformRelease != nil {
299
300
lm .AddPlatformReleaseLibrariesDir (platformRelease , libraries .PlatformBuiltIn )
300
301
}
301
302
}
0 commit comments