move from dhowden/tag to mdlayher/taggolib

scanner/scanner.go

@@ -9,7 +9,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dhowden/tag"
 	"github.com/jinzhu/gorm"
 	"github.com/karrick/godirwalk"
 	"github.com/pkg/errors"
@@ -198,7 +197,7 @@ func (s *Scanner) callbackItem(fullPath string, info *godirwalk.Dirent) error {
 
 func (s *Scanner) callbackPost(fullPath string, info *godirwalk.Dirent) error {
 	folder := s.curFolders.Pop()
-	if folder.IsNew {
+	if folder.ReceivedPaths {
 		folder.ParentID = s.curFolderID()
 		folder.Cover = s.curCover
 		s.tx.Save(folder)
@@ -209,19 +208,6 @@ func (s *Scanner) callbackPost(fullPath string, info *godirwalk.Dirent) error {
 	return nil
 }
 
-func readTags(path string) (tag.Metadata, error) {
-	trackData, err := os.Open(path)
-	if err != nil {
-		return nil, errors.Wrap(err, "reading track from disk")
-	}
-	defer trackData.Close()
-	tags, err := tag.ReadFrom(trackData)
-	if err != nil {
-		return nil, errors.Wrap(err, "reading tags from track")
-	}
-	return tags, nil
-}
-
 func (s *Scanner) handleFolder(it *item) error {
 	folder := &model.Album{}
 	defer s.curFolders.Push(folder)
@@ -240,7 +226,7 @@ func (s *Scanner) handleFolder(it *item) error {
 	folder.LeftPath = it.directory
 	folder.RightPath = it.filename
 	s.tx.Save(folder)
-	folder.IsNew = true
+	folder.ReceivedPaths = true
 	return nil
 }
 
@@ -268,21 +254,15 @@ func (s *Scanner) handleTrack(it *item) error {
 	track.Filename = it.filename
 	track.Size = int(it.stat.Size())
 	track.AlbumID = s.curFolderID()
-	track.Duration = -1
-	track.Bitrate = -1
 	tags, err := readTags(it.fullPath)
 	if err != nil {
 		return errors.Wrap(err, "reading tags")
 	}
-	trackNumber, totalTracks := tags.Track()
-	discNumber, totalDiscs := tags.Disc()
-	track.TagDiscNumber = discNumber
-	track.TagTotalDiscs = totalDiscs
-	track.TagTotalTracks = totalTracks
-	track.TagTrackNumber = trackNumber
 	track.TagTitle = tags.Title()
 	track.TagTrackArtist = tags.Artist()
-	track.TagYear = tags.Year()
+	track.TagTrackNumber = tags.TrackNumber()
+	track.Duration = tags.DurationSecs() // these two should be calculated
+	track.Bitrate = tags.Bitrate()       // from the file instead of tags
 	//
 	// set album artist basics
 	artist := &model.Artist{}
@@ -299,11 +279,14 @@ func (s *Scanner) handleTrack(it *item) error {
 	s.seenTracksNew++
 	//
 	// set album if this is the first track in the folder
-	if !s.curFolder().IsNew {
+	folder := s.curFolder()
+	if !folder.ReceivedPaths || folder.ReceivedTags {
+		// the folder hasn't been modified or already has it's tags
 		return nil
 	}
-	s.curFolder().TagTitle = tags.Album()
-	s.curFolder().TagYear = tags.Year()
-	s.curFolder().TagArtistID = artist.ID
+	folder.TagTitle = tags.Album()
+	folder.TagYear = tags.Year()
+	folder.TagArtistID = artist.ID
+	folder.ReceivedTags = true
 	return nil
 }

scanner/tags.go

@@ -0,0 +1,51 @@
+package scanner
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/mdlayher/taggolib"
+	"github.com/pkg/errors"
+)
+
+type tags struct {
+	taggolib.Parser
+}
+
+func (t *tags) Year() int {
+	// for this one there could be multiple tags and a
+	// date separator. so do string(2019-6-6) -> int(2019)
+	// for the two options and pick the first
+	for _, name := range []string{"DATE", "YEAR"} {
+		tag := t.Tag(name)
+		if tag == "" {
+			continue
+		}
+		parts := strings.Split(tag, "-")
+		year, err := strconv.Atoi(parts[0])
+		if err != nil {
+			continue
+		}
+		return year
+	}
+	return 0
+}
+
+func (t *tags) DurationSecs() int {
+	return int(t.Duration() / 1e9)
+}
+
+func readTags(path string) (*tags, error) {
+	track, err := os.Open(path)
+	if err != nil {
+		return nil, errors.Wrap(err, "reading track from disk")
+	}
+	defer track.Close()
+	parser, err := taggolib.New(track)
+	if err != nil {
+		return nil, errors.Wrap(err, "reading tags from track")
+	}
+	newTags := &tags{parser}
+	return newTags, nil
+}