Refactor file type functions

model/file_types.go

@@ -0,0 +1,30 @@
+package model
+
+import (
+	"mime"
+	"path/filepath"
+	"strings"
+
+	"golang.org/x/exp/slices"
+)
+
+var excludeAudioType = []string{
+	"audio/x-mpegurl",
+	"audio/x-scpls",
+}
+
+func IsAudioFile(filePath string) bool {
+	extension := filepath.Ext(filePath)
+	mimeType := mime.TypeByExtension(extension)
+	return !slices.Contains(excludeAudioType, mimeType) && strings.HasPrefix(mimeType, "audio/")
+}
+
+func IsImageFile(filePath string) bool {
+	extension := filepath.Ext(filePath)
+	return strings.HasPrefix(mime.TypeByExtension(extension), "image/")
+}
+
+func IsValidPlaylist(filePath string) bool {
+	extension := strings.ToLower(filepath.Ext(filePath))
+	return extension == ".m3u" || extension == ".m3u8" || extension == ".nsp"
+}

model/file_types_test.go

@@ -0,0 +1,61 @@
+package model_test
+
+import (
+	"path/filepath"
+
+	"github.com/navidrome/navidrome/model"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("File Types()", func() {
+	Describe("IsAudioFile", func() {
+		It("returns true for a MP3 file", func() {
+			Expect(model.IsAudioFile(filepath.Join("path", "to", "test.mp3"))).To(BeTrue())
+		})
+
+		It("returns true for a FLAC file", func() {
+			Expect(model.IsAudioFile("test.flac")).To(BeTrue())
+		})
+
+		It("returns false for a non-audio file", func() {
+			Expect(model.IsAudioFile("test.jpg")).To(BeFalse())
+		})
+
+		It("returns false for m3u files", func() {
+			Expect(model.IsAudioFile("test.m3u")).To(BeFalse())
+		})
+
+		It("returns false for pls files", func() {
+			Expect(model.IsAudioFile("test.pls")).To(BeFalse())
+		})
+	})
+
+	Describe("IsImageFile()", func() {
+		It("returns true for a PNG file", func() {
+			Expect(model.IsImageFile(filepath.Join("path", "to", "test.png"))).To(BeTrue())
+		})
+
+		It("returns true for a JPEG file", func() {
+			Expect(model.IsImageFile("test.JPEG")).To(BeTrue())
+		})
+
+		It("returns false for a non-image file", func() {
+			Expect(model.IsImageFile("test.mp3")).To(BeFalse())
+		})
+	})
+
+	Describe("IsValidPlaylist()", func() {
+		It("returns true for a M3U file", func() {
+			Expect(model.IsValidPlaylist(filepath.Join("path", "to", "test.m3u"))).To(BeTrue())
+		})
+
+		It("returns true for a M3U8 file", func() {
+			Expect(model.IsValidPlaylist(filepath.Join("path", "to", "test.m3u8"))).To(BeTrue())
+		})
+
+		It("returns false for a non-playlist file", func() {
+			Expect(model.IsValidPlaylist("testm3u")).To(BeFalse())
+		})
+	})
+})

model/playlist.go

@@ -2,7 +2,6 @@ package model
 
 import (
 	"fmt"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -138,8 +137,3 @@ type PlaylistTrackRepository interface {
 	DeleteAll() error
 	Reorder(pos int, newPos int) error
 }
-
-func IsValidPlaylist(filePath string) bool {
-	extension := strings.ToLower(filepath.Ext(filePath))
-	return extension == ".m3u" || extension == ".m3u8" || extension == ".nsp"
-}

model/playlists_test.go

@@ -1,27 +1,11 @@
 package model_test
 
 import (
-	"path/filepath"
-
 	"github.com/navidrome/navidrome/model"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("IsValidPlaylist()", func() {
-	It("returns true for a M3U file", func() {
-		Expect(model.IsValidPlaylist(filepath.Join("path", "to", "test.m3u"))).To(BeTrue())
-	})
-
-	It("returns true for a M3U8 file", func() {
-		Expect(model.IsValidPlaylist(filepath.Join("path", "to", "test.m3u8"))).To(BeTrue())
-	})
-
-	It("returns false for a non-playlist file", func() {
-		Expect(model.IsValidPlaylist("testm3u")).To(BeFalse())
-	})
-})
-
 var _ = Describe("Playlist", func() {
 	Describe("ToM3U8()", func() {
 		var pls model.Playlist