Moved code in a more logical grouping

Author: cmaglie

internal/arduino/cores/packagemanager/loader.go

@@ -228,21 +228,19 @@ func (pm *Builder) loadPlatform(targetPackage *cores.Package, architecture strin
 }
 
 func (pm *Builder) loadPlatformRelease(platform *cores.PlatformRelease, path *paths.Path) error {
-	platform.InstallDir = path
-
 	// If the installed.json file is found load it, this is done to handle the
 	// case in which the platform's index and its url have been deleted locally,
 	// if we don't load it some information about the platform is lost
 	installedJSONPath := path.Join("installed.json")
-	platform.Timestamps.AddFile(installedJSONPath)
 	if installedJSONPath.Exist() {
 		if _, err := pm.LoadPackageIndexFromFile(installedJSONPath); err != nil {
 			return errors.New(i18n.Tr("loading %[1]s: %[2]s", installedJSONPath, err))
 		}
 	}
 
-	// TODO: why CLONE?
-	platform.Properties = platform.Properties.Clone()
+	platform.InstallDir = path
+	platform.Timestamps.AddFile(installedJSONPath)
+	platform.Properties = platform.Properties.Clone() // TODO: why CLONE?
 
 	// Create platform properties
 	platformTxtPath := path.Join("platform.txt")

internal/arduino/cores/packagemanager/profiles.go

@@ -72,10 +72,6 @@ func (pmb *Builder) LoadHardwareForProfile(ctx context.Context, p *sketch.Profil
 }
 
 func (pmb *Builder) loadProfilePlatform(ctx context.Context, platformRef *sketch.ProfilePlatformReference, installMissing bool, downloadCB rpc.DownloadProgressCB, taskCB rpc.TaskProgressCB, settings *configuration.Settings) (*cores.PlatformRelease, error) {
-	targetPackage := pmb.packages.GetOrCreatePackage(platformRef.Packager)
-	platform := targetPackage.GetOrCreatePlatform(platformRef.Architecture)
-	release := platform.GetOrCreateRelease(platformRef.Version)
-
 	uid := platformRef.InternalUniqueIdentifier()
 	destDir := settings.ProfilesCacheDir().Join(uid)
 	if !destDir.IsDir() && installMissing {
@@ -84,6 +80,10 @@ func (pmb *Builder) loadProfilePlatform(ctx context.Context, platformRef *sketch
 			return nil, err
 		}
 	}
+
+	targetPackage := pmb.packages.GetOrCreatePackage(platformRef.Packager)
+	platform := targetPackage.GetOrCreatePlatform(platformRef.Architecture)
+	release := platform.GetOrCreateRelease(platformRef.Version)
 	return release, pmb.loadPlatformRelease(release, destDir)
 }