Ignores files that are not music files

Ignores `.DS_Store` and other files that should not be transcoded.
topfunky · May 4, 2024 · 73aebab · 73aebab
1 parent 22ab69e
commit 73aebab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/find_and_transcode_files.go b/find_and_transcode_files.go
@@ -157,9 +157,11 @@ func getExclusiveFiles(filesA, filesB []string) []FileToRender {
 		destinationFilename := ""
 		if strings.HasSuffix(file, ".mp3") {
 			destinationFilename = file
-		} else {
+		} else if strings.HasSuffix(file, ".m4a") {
 			// TODO: Use func to get file ext instead of hard coding .m4a
 			destinationFilename = strings.TrimSuffix(file, ".m4a") + ".mp3"
+		} else {
+			file = ""
 		}
 		fileToRender := FileToRender{
 			sourcePath:      file,
@@ -170,7 +172,7 @@ func getExclusiveFiles(filesA, filesB []string) []FileToRender {
 	}
 
 	for _, file := range sourceFileOutputNameList {
-		if !fileMap[file.destinationPath] {
+		if !fileMap[file.destinationPath] && file.destinationPath != "" {
 			exclusiveFiles = append(exclusiveFiles, file)
 		}
 	}

diff --git a/find_and_transcode_files_test.go b/find_and_transcode_files_test.go
@@ -55,6 +55,12 @@ func TestGetExclusiveFiles(t *testing.T) {
 			DestinationList: []string{"file4.m4a", "file5.mp3", "file6.mp3"},
 			ExpectedOutput:  []string{"file1.m4a", "file2.m4a", "file3.m4a"},
 		},
+		{
+			Name:            "Ignore non-music files",
+			SourceList:      []string{".DS_Store"},
+			DestinationList: []string{},
+			ExpectedOutput:  []string(nil),
+		},
 	}
 
 	for _, c := range cases {

diff --git a/sync_and_transcode_music_files_test.go b/sync_and_transcode_music_files_test.go
@@ -55,6 +55,7 @@ func setupFixtureFilesInDirectory(tempDir string, numberOfFiles int) error {
 		"source/a-band/file5.m4a",
 		"source/Whitespace Band/file6.m4a",
 		"source/the-band/file7.mp3",
+		"source/.DS_Store",
 	}
 	for _, file := range testFiles[0:numberOfFiles] {
 		filePath := filepath.Join(tempDir, file)
@@ -117,6 +118,12 @@ func TestFindFiles(t *testing.T) {
 		assert.True(t, os.IsNotExist(err), fmt.Sprintf("unexpected transcoded file found: %s", nonTranscodedFile))
 	})
 
+	t.Run("Verify that the .DS_Store file was not transcoded", func(t *testing.T) {
+		nonTranscodedFile := ".DS_Store"
+		filePath := filepath.Join(tempDir, nonTranscodedFile)
+		_, err = os.Stat(filePath)
+		assert.True(t, os.IsNotExist(err), fmt.Sprintf("unexpected transcoded file found: %s", nonTranscodedFile))
+	})
 }
 
 // Destination files should not be re-rendered (check file modified time from first render and compare to second render)