Skip to content

Commit cc6f676

Browse files
refactor UnusedCompiledLibrariesRemover in a function
1 parent 8d6c6d3 commit cc6f676

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

legacy/builder/builder.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,14 @@ func (s *Builder) Run(ctx *types.Context) error {
9797
types.BareCommand(func(ctx *types.Context) error {
9898
return recipeByPrefixSuffixRunner(ctx, "recipe.hooks.libraries.prebuild", ".pattern", false)
9999
}),
100-
&UnusedCompiledLibrariesRemover{},
100+
101+
types.BareCommand(func(ctx *types.Context) error {
102+
return UnusedCompiledLibrariesRemover(
103+
ctx.LibrariesBuildPath,
104+
ctx.SketchLibrariesDetector.ImportedLibraries(),
105+
)
106+
}),
107+
101108
types.BareCommand(func(ctx *types.Context) error {
102109
librariesObjectFiles, err := phases.LibrariesBuilder(
103110
ctx.LibrariesBuildPath,

legacy/builder/test/unused_compiled_libraries_remover_test.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ func TestUnusedCompiledLibrariesRemover(t *testing.T) {
4242
)
4343
ctx.SketchLibrariesDetector.AppendImportedLibraries(&libraries.Library{Name: "Bridge"})
4444

45-
cmd := builder.UnusedCompiledLibrariesRemover{}
46-
err = cmd.Run(ctx)
45+
err = builder.UnusedCompiledLibrariesRemover(
46+
ctx.LibrariesBuildPath,
47+
ctx.SketchLibrariesDetector.ImportedLibraries(),
48+
)
4749
require.NoError(t, err)
4850

4951
exist, err := temp.Join("SPI").ExistCheck()
@@ -65,8 +67,10 @@ func TestUnusedCompiledLibrariesRemoverLibDoesNotExist(t *testing.T) {
6567
)
6668
ctx.SketchLibrariesDetector.AppendImportedLibraries(&libraries.Library{Name: "Bridge"})
6769

68-
cmd := builder.UnusedCompiledLibrariesRemover{}
69-
err := cmd.Run(ctx)
70+
err := builder.UnusedCompiledLibrariesRemover(
71+
ctx.LibrariesBuildPath,
72+
ctx.SketchLibrariesDetector.ImportedLibraries(),
73+
)
7074
require.NoError(t, err)
7175
}
7276

@@ -85,8 +89,10 @@ func TestUnusedCompiledLibrariesRemoverNoUsedLibraries(t *testing.T) {
8589
)
8690
ctx.LibrariesBuildPath = temp
8791

88-
cmd := builder.UnusedCompiledLibrariesRemover{}
89-
err = cmd.Run(ctx)
92+
err = builder.UnusedCompiledLibrariesRemover(
93+
ctx.LibrariesBuildPath,
94+
ctx.SketchLibrariesDetector.ImportedLibraries(),
95+
)
9096
require.NoError(t, err)
9197

9298
exist, err := temp.Join("SPI").ExistCheck()

legacy/builder/unused_compiled_libraries_remover.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,22 @@ package builder
1717

1818
import (
1919
"github.com/arduino/arduino-cli/arduino/libraries"
20-
"github.com/arduino/arduino-cli/legacy/builder/types"
20+
"github.com/arduino/go-paths-helper"
2121
"github.com/pkg/errors"
2222
"golang.org/x/exp/slices"
2323
)
2424

25-
type UnusedCompiledLibrariesRemover struct{}
26-
27-
func (s *UnusedCompiledLibrariesRemover) Run(ctx *types.Context) error {
28-
librariesBuildPath := ctx.LibrariesBuildPath
29-
25+
func UnusedCompiledLibrariesRemover(librariesBuildPath *paths.Path, importedLibraries libraries.List) error {
3026
if librariesBuildPath.NotExist() {
3127
return nil
3228
}
3329

34-
libraryNames := toLibraryNames(ctx.SketchLibrariesDetector.ImportedLibraries())
35-
3630
files, err := librariesBuildPath.ReadDir()
3731
if err != nil {
3832
return errors.WithStack(err)
3933
}
34+
35+
libraryNames := toLibraryNames(importedLibraries)
4036
for _, file := range files {
4137
if file.IsDir() {
4238
if !slices.Contains(libraryNames, file.Base()) {

0 commit comments

Comments
 (0)