Skip to content

Commit 937f2da

Browse files
committed
Use paths.ReadDirRecursive filtered where possible
1 parent 422aa87 commit 937f2da

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

arduino/sketch/sketch.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,26 @@ func New(path *paths.Path) (*Sketch, error) {
158158
// supportedFiles reads all files recursively contained in Sketch and
159159
// filter out unneded or unsupported ones and returns them
160160
func (s *Sketch) supportedFiles() (*paths.PathList, error) {
161-
files, err := s.FullPath.ReadDirRecursive()
162-
if err != nil {
163-
return nil, err
164-
}
165-
files.FilterOutDirs()
166-
files.FilterOutHiddenFiles()
167161
validExtensions := []string{}
168162
for ext := range globals.MainFileValidExtensions {
169163
validExtensions = append(validExtensions, ext)
170164
}
171165
for ext := range globals.AdditionalFileValidExtensions {
172166
validExtensions = append(validExtensions, ext)
173167
}
174-
files.FilterSuffix(validExtensions...)
175-
return &files, nil
176168

169+
files, err := s.FullPath.ReadDirRecursiveFiltered(
170+
nil,
171+
paths.AndFilter(
172+
paths.FilterOutPrefixes("."),
173+
paths.FilterSuffixes(validExtensions...),
174+
paths.FilterOutDirectories(),
175+
),
176+
)
177+
if err != nil {
178+
return nil, err
179+
}
180+
return &files, nil
177181
}
178182

179183
// GetProfile returns the requested profile or nil if the profile

0 commit comments

Comments
 (0)