Moved Metadata Extraction to its own package

navidrome · Sep 8, 2020 · 1187ee7 · 1187ee7
1 parent 0beec55
commit 1187ee7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/scanner/mapping.go b/scanner/mapping.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/model"
+	"github.com/deluan/navidrome/scanner/metadata"
 	"github.com/deluan/navidrome/utils"
 	"github.com/kennygrant/sanitize"
 )
@@ -21,7 +22,7 @@ func newMediaFileMapper(rootFolder string) *mediaFileMapper {
 	return &mediaFileMapper{rootFolder: rootFolder}
 }
 
-func (s *mediaFileMapper) toMediaFile(md Metadata) model.MediaFile {
+func (s *mediaFileMapper) toMediaFile(md metadata.Metadata) model.MediaFile {
 	mf := &model.MediaFile{}
 	mf.ID = s.trackID(md)
 	mf.Title = s.mapTrackTitle(md)
@@ -64,7 +65,7 @@ func sanitizeFieldForSorting(originalValue string) string {
 	return utils.NoArticle(v)
 }
 
-func (s *mediaFileMapper) mapTrackTitle(md Metadata) string {
+func (s *mediaFileMapper) mapTrackTitle(md metadata.Metadata) string {
 	if md.Title() == "" {
 		s := strings.TrimPrefix(md.FilePath(), s.rootFolder+string(os.PathSeparator))
 		e := filepath.Ext(s)
@@ -73,7 +74,7 @@ func (s *mediaFileMapper) mapTrackTitle(md Metadata) string {
 	return md.Title()
 }
 
-func (s *mediaFileMapper) mapAlbumArtistName(md Metadata) string {
+func (s *mediaFileMapper) mapAlbumArtistName(md metadata.Metadata) string {
 	switch {
 	case md.Compilation():
 		return consts.VariousArtists
@@ -86,34 +87,34 @@ func (s *mediaFileMapper) mapAlbumArtistName(md Metadata) string {
 	}
 }
 
-func (s *mediaFileMapper) mapArtistName(md Metadata) string {
+func (s *mediaFileMapper) mapArtistName(md metadata.Metadata) string {
 	if md.Artist() != "" {
 		return md.Artist()
 	}
 	return consts.UnknownArtist
 }
 
-func (s *mediaFileMapper) mapAlbumName(md Metadata) string {
+func (s *mediaFileMapper) mapAlbumName(md metadata.Metadata) string {
 	name := md.Album()
 	if name == "" {
 		return "[Unknown Album]"
 	}
 	return name
 }
 
-func (s *mediaFileMapper) trackID(md Metadata) string {
+func (s *mediaFileMapper) trackID(md metadata.Metadata) string {
 	return fmt.Sprintf("%x", md5.Sum([]byte(md.FilePath())))
 }
 
-func (s *mediaFileMapper) albumID(md Metadata) string {
+func (s *mediaFileMapper) albumID(md metadata.Metadata) string {
 	albumPath := strings.ToLower(fmt.Sprintf("%s\\%s", s.mapAlbumArtistName(md), s.mapAlbumName(md)))
 	return fmt.Sprintf("%x", md5.Sum([]byte(albumPath)))
 }
 
-func (s *mediaFileMapper) artistID(md Metadata) string {
+func (s *mediaFileMapper) artistID(md metadata.Metadata) string {
 	return fmt.Sprintf("%x", md5.Sum([]byte(strings.ToLower(s.mapArtistName(md)))))
 }
 
-func (s *mediaFileMapper) albumArtistID(md Metadata) string {
+func (s *mediaFileMapper) albumArtistID(md metadata.Metadata) string {
 	return fmt.Sprintf("%x", md5.Sum([]byte(strings.ToLower(s.mapAlbumArtistName(md)))))
 }
diff --git a/scanner/metadata_ffmpeg.go → scanner/metadata/ffmpeg.go b/scanner/metadata_ffmpeg.go → scanner/metadata/ffmpeg.go
@@ -1,4 +1,4 @@
-package scanner
+package metadata
 
 import (
 	"bufio"

diff --git a/scanner/metadata_ffmpeg_test.go → scanner/metadata/ffmpeg_test.go b/scanner/metadata_ffmpeg_test.go → scanner/metadata/ffmpeg_test.go
@@ -1,4 +1,4 @@
-package scanner
+package metadata
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/scanner/metadata.go → scanner/metadata/metadata.go b/scanner/metadata.go → scanner/metadata/metadata.go
@@ -1,4 +1,4 @@
-package scanner
+package metadata
 
 import "time"
 
@@ -28,6 +28,11 @@ type Metadata interface {
 	Size() int64
 }
 
-type MetadataExtractor interface {
+type Extractor interface {
 	Extract(files ...string) (map[string]Metadata, error)
 }
+
+func Extract(files ...string) (map[string]Metadata, error) {
+	e := &ffmpegMetadataExtractor{}
+	return e.Extract(files...)
+}
diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go
@@ -12,6 +12,7 @@ import (
 	"github.com/deluan/navidrome/log"
 	"github.com/deluan/navidrome/model"
 	"github.com/deluan/navidrome/model/request"
+	"github.com/deluan/navidrome/scanner/metadata"
 	"github.com/deluan/navidrome/utils"
 )
 
@@ -340,13 +341,8 @@ func (s *TagScanner) addOrUpdateTracksInDB(ctx context.Context, dir string, curr
 	return numUpdatedTracks, nil
 }
 
-func (s *TagScanner) newMetadataExtractor() MetadataExtractor {
-	return &ffmpegMetadataExtractor{}
-}
-
 func (s *TagScanner) loadTracks(filePaths []string) (model.MediaFiles, error) {
-	e := s.newMetadataExtractor()
-	mds, err := e.Extract(filePaths...)
+	mds, err := metadata.Extract(filePaths...)
 	if err != nil {
 		return nil, err
 	}