Ignoring all files that start with a dot. Fixes #82

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/collect_all_source_files_from_folders_with_sources.go

@@ -68,8 +68,10 @@ func (s *CollectAllSourceFilesFromFoldersWithSources) Run(context map[string]int
 }
 
 func collectByWalk(filePaths *[]string, folder string) error {
-	checkExtensionFunc := func(ext string) bool {
-		return ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS[ext]
+	checkExtensionFunc := func(filePath string) bool {
+		name := filepath.Base(filePath)
+		ext := strings.ToLower(filepath.Ext(filePath))
+		return !strings.HasPrefix(name, ".") && ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS[ext]
 	}
 	walkFunc := utils.CollectAllReadableFiles(filePaths, checkExtensionFunc)
 	err := gohasissues.Walk(folder, walkFunc)

Diff for: src/arduino.cc/builder/sketch_loader.go

@@ -87,8 +87,10 @@ func (s *SketchLoader) Run(context map[string]interface{}) error {
 
 func collectAllSketchFiles(from string) ([]string, error) {
 	filePaths := []string{}
-	checkExtensionFunc := func(ext string) bool {
-		return MAIN_FILE_VALID_EXTENSIONS[ext] || ADDITIONAL_FILE_VALID_EXTENSIONS[ext]
+	checkExtensionFunc := func(filePath string) bool {
+		name := filepath.Base(filePath)
+		ext := strings.ToLower(filepath.Ext(filePath))
+		return !strings.HasPrefix(name, ".") && MAIN_FILE_VALID_EXTENSIONS[ext] || ADDITIONAL_FILE_VALID_EXTENSIONS[ext]
 	}
 	walkFunc := utils.CollectAllReadableFiles(&filePaths, checkExtensionFunc)
 	err := gohasissues.Walk(from, walkFunc)

Diff for: src/arduino.cc/builder/test/sketch_loader_test.go

@@ -165,3 +165,26 @@ func TestLoadSketchWithBackup(t *testing.T) {
 	require.Equal(t, 0, len(sketch.AdditionalFiles))
 	require.Equal(t, 0, len(sketch.OtherSketchFiles))
 }
+
+func TestLoadSketchWithMacOSXGarbage(t *testing.T) {
+	context := make(map[string]interface{})
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch_with_macosx_garbage", "sketch.ino")
+
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+		&builder.SketchLoader{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
+
+	sketch := context[constants.CTX_SKETCH].(*types.Sketch)
+	require.NotNil(t, sketch)
+
+	require.Contains(t, sketch.MainFile.Name, "sketch.ino")
+
+	require.Equal(t, 0, len(sketch.AdditionalFiles))
+	require.Equal(t, 0, len(sketch.OtherSketchFiles))
+}

Diff for: src/arduino.cc/builder/test/sketch_with_macosx_garbage/.#sketch.ino

@@ -0,0 +1,2 @@
+void setup()
+void loop) }

Diff for: src/arduino.cc/builder/test/sketch_with_macosx_garbage/sketch.ino

@@ -0,0 +1,2 @@
+void setup() {}
+void loop() {}

Diff for: src/arduino.cc/builder/utils/utils.go

@@ -384,9 +384,9 @@ func FilterOutFoldersByNames(folders []os.FileInfo, names ...string) []os.FileIn
 	return filtered
 }
 
-type CheckFileExtensionFunc func(ext string) bool
+type CheckFilePathFunc func(filePath string) bool
 
-func CollectAllReadableFiles(collector *[]string, test CheckFileExtensionFunc) filepath.WalkFunc {
+func CollectAllReadableFiles(collector *[]string, test CheckFilePathFunc) filepath.WalkFunc {
 	walkFunc := func(currentPath string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -395,8 +395,7 @@ func CollectAllReadableFiles(collector *[]string, test CheckFileExtensionFunc) f
 		if info.IsDir() {
 			return nil
 		}
-		ext := strings.ToLower(filepath.Ext(currentPath))
-		if !test(ext) {
+		if !test(currentPath) {
 			return nil
 		}
 		currentFile, err := os.Open(currentPath)