Commit 6958071

committed

refactor LoadPreviousBuildOptionsMap in a function

1 parent de0e25e commit 6958071Copy full SHA for 6958071

File tree

+17

-19

lines changed

+17

-19

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,13 @@ func (s ContainerBuildOptions) Run(ctx types.Context) error {`
`33`	`33`	`}`
`34`	`34`	`ctx.BuildOptionsJson = buildPropertiesJSON`
`35`	`35`
	`36`	`+ buildOptionsJsonPrevious, err := LoadPreviousBuildOptionsMap(ctx.BuildPath)`
	`37`	`+ if err != nil {`
	`38`	`+ return errors.WithStack(err)`
	`39`	`+ }`
	`40`	`+ ctx.BuildOptionsJsonPrevious = buildOptionsJsonPrevious`
	`41`	`+`
`36`	`42`	`commands := []types.Command{`
`37`		`- &LoadPreviousBuildOptionsMap{},`
`38`	`43`	`&WipeoutBuildPathIfBuildOptionsChanged{},`
`39`	`44`	`&StoreBuildOptionsMap{},`
`40`	`45`	`}`

Lines changed: 7 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,20 @@ package builder`
`17`	`17`
`18`	`18`	`import (`
`19`	`19`	`"github.com/arduino/arduino-cli/legacy/builder/constants"`
`20`		`- "github.com/arduino/arduino-cli/legacy/builder/types"`
	`20`	`+ "github.com/arduino/go-paths-helper"`
`21`	`21`	`"github.com/pkg/errors"`
`22`	`22`	`)`
`23`	`23`
`24`		`-type LoadPreviousBuildOptionsMap struct{}`
`25`		`-`
`26`		`-func (s LoadPreviousBuildOptionsMap) Run(ctx types.Context) error {`
`27`		`- buildOptionsFile := ctx.BuildPath.Join(constants.BUILD_OPTIONS_FILE)`
	`24`	`+func LoadPreviousBuildOptionsMap(buildPath *paths.Path) (string, error) {`
	`25`	`+ buildOptionsFile := buildPath.Join(constants.BUILD_OPTIONS_FILE)`
`28`	`26`
`29`	`27`	`if buildOptionsFile.NotExist() {`
`30`		`- return nil`
	`28`	`+ return "", nil`
`31`	`29`	`}`
`32`	`30`
`33`		`- bytes, err := buildOptionsFile.ReadFile()`
	`31`	`+ buildOptionsJsonPrevious, err := buildOptionsFile.ReadFile()`
`34`	`32`	`if err != nil {`
`35`		`- return errors.WithStack(err)`
	`33`	`+ return "", errors.WithStack(err)`
`36`	`34`	`}`
`37`		`-`
`38`		`- ctx.BuildOptionsJsonPrevious = string(bytes)`
`39`		`- return nil`
	`35`	`+ return string(buildOptionsJsonPrevious), nil`
`40`	`36`	`}`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,10 @@ func TestLoadPreviousBuildOptionsMap(t *testing.T) {`
`33`	`33`	`err := buildPath.Join(constants.BUILD_OPTIONS_FILE).WriteFile([]byte("test"))`
`34`	`34`	`require.NoError(t, err)`
`35`	`35`
`36`		`- command := builder.LoadPreviousBuildOptionsMap{}`
`37`		`- err = command.Run(ctx)`
	`36`	`+ buildOptionsJsonPrevious, err := builder.LoadPreviousBuildOptionsMap(ctx.BuildPath)`
`38`	`37`	`require.NoError(t, err)`
`39`	`38`
`40`		`- require.Equal(t, "test", ctx.BuildOptionsJsonPrevious)`
	`39`	`+ require.Equal(t, "test", buildOptionsJsonPrevious)`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`func TestLoadPreviousBuildOptionsMapMissingFile(t *testing.T) {`
`@@ -46,9 +45,7 @@ func TestLoadPreviousBuildOptionsMapMissingFile(t *testing.T) {`
`46`	`45`	`buildPath := SetupBuildPath(t, ctx)`
`47`	`46`	`defer buildPath.RemoveAll()`
`48`	`47`
`49`		`- command := builder.LoadPreviousBuildOptionsMap{}`
`50`		`- err := command.Run(ctx)`
	`48`	`+ buildOptionsJsonPrevious, err := builder.LoadPreviousBuildOptionsMap(ctx.BuildPath)`
`51`	`49`	`require.NoError(t, err)`
`52`		`-`
`53`		`- require.Empty(t, ctx.BuildOptionsJsonPrevious)`
	`50`	`+ require.Empty(t, buildOptionsJsonPrevious)`
`54`	`51`	`}`

Comments

(0)