slightly refactored directoryContainsFile function

Author: cmaglie

legacy/builder/phases/libraries_builder.go

@@ -53,16 +53,12 @@ func (s *LibrariesBuilder) Run(ctx *types.Context) error {
 	return nil
 }
 
-func containsFile(folder *paths.Path) bool {
-	res, _ := folder.ReadDir()
-	hasfiles := false
-	for _, el := range res {
-		if !el.IsDir() {
-			hasfiles = true
-			break
-		}
+func directoryContainsFile(folder *paths.Path) bool {
+	if files, err := folder.ReadDir(); err == nil {
+		files.FilterOutDirs()
+		return len(files) > 0
 	}
-	return hasfiles
+	return false
 }
 
 func findExpectedPrecompiledLibFolder(ctx *types.Context, library *libraries.Library) *paths.Path {
@@ -98,15 +94,15 @@ func findExpectedPrecompiledLibFolder(ctx *types.Context, library *libraries.Lib
 	if len(fpuSpecs) > 0 {
 		fpuSpecs = strings.TrimRight(fpuSpecs, "-")
 		fullPrecompDir := library.SourceDir.Join(mcu).Join(fpuSpecs)
-		if fullPrecompDir.Exist() && containsFile(fullPrecompDir) {
+		if fullPrecompDir.Exist() && directoryContainsFile(fullPrecompDir) {
 			logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "Using precompiled library in {0}", fullPrecompDir)
 			return fullPrecompDir
 		}
 		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "Precompiled library in \"{0}\" not found", fullPrecompDir)
 	}
 
 	precompDir := library.SourceDir.Join(mcu)
-	if precompDir.Exist() && containsFile(precompDir) {
+	if precompDir.Exist() && directoryContainsFile(precompDir) {
 		logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "Using precompiled library in {0}", precompDir)
 		return precompDir
 	}