refactor LoadPreviousBuildOptionsMap in a function

Author: alessio-perugini

Diff for: legacy/builder/container_build_options.go

@@ -33,8 +33,13 @@ func (s *ContainerBuildOptions) Run(ctx *types.Context) error {
 	}
 	ctx.BuildOptionsJson = buildOptionsJSON
 
+	buildOptionsJsonPrevious, err := LoadPreviousBuildOptionsMap(ctx.BuildPath)
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	ctx.BuildOptionsJsonPrevious = buildOptionsJsonPrevious
+
 	commands := []types.Command{
-		&LoadPreviousBuildOptionsMap{},
 		&WipeoutBuildPathIfBuildOptionsChanged{},
 		&StoreBuildOptionsMap{},
 	}

Diff for: legacy/builder/load_previous_build_options.go

@@ -17,24 +17,20 @@ package builder
 
 import (
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
-	"github.com/arduino/arduino-cli/legacy/builder/types"
+	"github.com/arduino/go-paths-helper"
 	"github.com/pkg/errors"
 )
 
-type LoadPreviousBuildOptionsMap struct{}
-
-func (s *LoadPreviousBuildOptionsMap) Run(ctx *types.Context) error {
-	buildOptionsFile := ctx.BuildPath.Join(constants.BUILD_OPTIONS_FILE)
+func LoadPreviousBuildOptionsMap(buildPath *paths.Path) (string, error) {
+	buildOptionsFile := buildPath.Join(constants.BUILD_OPTIONS_FILE)
 
 	if buildOptionsFile.NotExist() {
-		return nil
+		return "", nil
 	}
 
-	bytes, err := buildOptionsFile.ReadFile()
+	buildOptionsJsonPrevious, err := buildOptionsFile.ReadFile()
 	if err != nil {
-		return errors.WithStack(err)
+		return "", errors.WithStack(err)
 	}
-
-	ctx.BuildOptionsJsonPrevious = string(bytes)
-	return nil
+	return string(buildOptionsJsonPrevious), nil
 }

Diff for: legacy/builder/test/load_previous_build_options_map_test.go

@@ -33,11 +33,10 @@ func TestLoadPreviousBuildOptionsMap(t *testing.T) {
 	err := buildPath.Join(constants.BUILD_OPTIONS_FILE).WriteFile([]byte("test"))
 	require.NoError(t, err)
 
-	command := builder.LoadPreviousBuildOptionsMap{}
-	err = command.Run(ctx)
+	buildOptionsJsonPrevious, err := builder.LoadPreviousBuildOptionsMap(ctx.BuildPath)
 	require.NoError(t, err)
 
-	require.Equal(t, "test", ctx.BuildOptionsJsonPrevious)
+	require.Equal(t, "test", buildOptionsJsonPrevious)
 }
 
 func TestLoadPreviousBuildOptionsMapMissingFile(t *testing.T) {
@@ -46,9 +45,7 @@ func TestLoadPreviousBuildOptionsMapMissingFile(t *testing.T) {
 	buildPath := SetupBuildPath(t, ctx)
 	defer buildPath.RemoveAll()
 
-	command := builder.LoadPreviousBuildOptionsMap{}
-	err := command.Run(ctx)
+	buildOptionsJsonPrevious, err := builder.LoadPreviousBuildOptionsMap(ctx.BuildPath)
 	require.NoError(t, err)
-
-	require.Empty(t, ctx.BuildOptionsJsonPrevious)
+	require.Empty(t, buildOptionsJsonPrevious)
 }