Big Importer/Scanner refactor

scanner/itunes_scanner.go

@@ -1,7 +1,12 @@
 package scanner
 
 import (
+	"crypto/md5"
+	"fmt"
+	"github.com/astaxie/beego"
+	"github.com/deluan/gosonic/domain"
 	"github.com/deluan/itl"
+	"github.com/dhowden/tag"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -9,45 +14,152 @@ import (
 	"strings"
 )
 
-type ItunesScanner struct{}
+type ItunesScanner struct {
+	mediaFiles map[string]*domain.MediaFile
+	albums     map[string]*domain.Album
+	artists    map[string]*domain.Artist
+}
 
-func (s *ItunesScanner) LoadFolder(path string) []Track {
+func (s *ItunesScanner) ScanLibrary(path string) (int, error) {
 	xml, _ := os.Open(path)
-	l, _ := itl.ReadFromXML(xml)
+	l, err := itl.ReadFromXML(xml)
+	if err != nil {
+		return 0, err
+	}
+
+	s.mediaFiles = make(map[string]*domain.MediaFile)
+	s.albums = make(map[string]*domain.Album)
+	s.artists = make(map[string]*domain.Artist)
 
-	mediaFiles := make([]Track, len(l.Tracks))
 	i := 0
-	for id, t := range l.Tracks {
+	for _, t := range l.Tracks {
 		if strings.HasPrefix(t.Location, "file://") && strings.Contains(t.Kind, "audio") {
-			mediaFiles[i].Id = id
-			mediaFiles[i].Album = unescape(t.Album)
-			mediaFiles[i].Title = unescape(t.Name)
-			mediaFiles[i].Artist = unescape(t.Artist)
-			mediaFiles[i].AlbumArtist = unescape(t.AlbumArtist)
-			mediaFiles[i].Genre = unescape(t.Genre)
-			mediaFiles[i].Compilation = t.Compilation
-			mediaFiles[i].Loved = t.Loved
-			mediaFiles[i].AlbumLoved = t.AlbumLoved
-			mediaFiles[i].Year = t.Year
-			mediaFiles[i].TrackNumber = t.TrackNumber
-			mediaFiles[i].DiscNumber = t.DiscNumber
-			if t.Size > 0 {
-				mediaFiles[i].Size = strconv.Itoa(t.Size)
-			}
-			if t.TotalTime > 0 {
-				mediaFiles[i].Duration = t.TotalTime / 1000
-			}
-			mediaFiles[i].BitRate = t.BitRate
-			path, _ = url.QueryUnescape(t.Location)
-			path = strings.TrimPrefix(unescape(path), "file://")
-			mediaFiles[i].Path = path
-			mediaFiles[i].Suffix = strings.TrimPrefix(filepath.Ext(path), ".")
-			mediaFiles[i].CreatedAt = t.DateAdded
-			mediaFiles[i].UpdatedAt = t.DateModified
+			ar := s.collectArtists(&t)
+			mf := s.collectMediaFiles(&t)
+			s.collectAlbums(&t, mf, ar)
 			i++
 		}
 	}
-	return mediaFiles[0:i]
+	return len(l.Tracks), nil
+}
+
+func (s *ItunesScanner) MediaFiles() map[string]*domain.MediaFile {
+	return s.mediaFiles
+}
+func (s *ItunesScanner) Albums() map[string]*domain.Album {
+	return s.albums
+}
+func (s *ItunesScanner) Artists() map[string]*domain.Artist {
+	return s.artists
+}
+
+func (s *ItunesScanner) collectMediaFiles(t *itl.Track) *domain.MediaFile {
+	mf := &domain.MediaFile{}
+	mf.Id = strconv.Itoa(t.TrackID)
+	mf.Album = unescape(t.Album)
+	mf.AlbumId = albumId(t)
+	mf.Title = unescape(t.Name)
+	mf.Artist = unescape(t.Artist)
+	mf.AlbumArtist = unescape(t.AlbumArtist)
+	mf.Genre = unescape(t.Genre)
+	mf.Compilation = t.Compilation
+	mf.Starred = t.Loved
+	mf.Year = t.Year
+	mf.TrackNumber = t.TrackNumber
+	mf.DiscNumber = t.DiscNumber
+	if t.Size > 0 {
+		mf.Size = strconv.Itoa(t.Size)
+	}
+	if t.TotalTime > 0 {
+		mf.Duration = t.TotalTime / 1000
+	}
+	mf.BitRate = t.BitRate
+
+	path, _ := url.QueryUnescape(t.Location)
+	path = strings.TrimPrefix(unescape(path), "file://")
+	mf.Path = path
+	mf.Suffix = strings.TrimPrefix(filepath.Ext(path), ".")
+	mf.HasCoverArt = hasCoverArt(path)
+
+	mf.CreatedAt = t.DateAdded
+	mf.UpdatedAt = t.DateModified
+
+	s.mediaFiles[mf.Id] = mf
+
+	return mf
+}
+
+func (s *ItunesScanner) collectAlbums(t *itl.Track, mf *domain.MediaFile, ar *domain.Artist) *domain.Album {
+	id := albumId(t)
+	_, found := s.albums[id]
+	if !found {
+		s.albums[id] = &domain.Album{}
+	}
+
+	al := s.albums[id]
+	al.Id = id
+	al.ArtistId = ar.Id
+	al.Name = mf.Album
+	al.Year = t.Year
+	al.Compilation = t.Compilation
+	al.Starred = t.AlbumLoved
+	al.Genre = mf.Genre
+	al.Artist = mf.Artist
+	al.AlbumArtist = mf.AlbumArtist
+
+	if mf.HasCoverArt {
+		al.CoverArtId = mf.Id
+	}
+
+	if al.CreatedAt.IsZero() || t.DateAdded.Before(al.CreatedAt) {
+		al.CreatedAt = t.DateAdded
+	}
+	if al.UpdatedAt.IsZero() || t.DateModified.After(al.UpdatedAt) {
+		al.UpdatedAt = t.DateModified
+	}
+
+	return al
+}
+
+func (s *ItunesScanner) collectArtists(t *itl.Track) *domain.Artist {
+	id := artistId(t)
+	_, found := s.artists[id]
+	if !found {
+		s.artists[id] = &domain.Artist{}
+	}
+	ar := s.artists[id]
+	ar.Id = id
+	ar.Name = unescape(realArtistName(t))
+
+	return ar
+}
+
+func albumId(t *itl.Track) string {
+	s := fmt.Sprintf("%s\\%s", realArtistName(t), t.Album)
+	return fmt.Sprintf("%x", md5.Sum([]byte(s)))
+}
+
+func artistId(t *itl.Track) string {
+	return fmt.Sprintf("%x", md5.Sum([]byte(realArtistName(t))))
+}
+
+func hasCoverArt(path string) bool {
+	if _, err := os.Stat(path); err == nil {
+		f, err := os.Open(path)
+		if err != nil {
+			beego.Warn("Error opening file", path, "-", err)
+			return false
+		}
+		defer f.Close()
+
+		m, err := tag.ReadFrom(f)
+		if err != nil {
+			beego.Warn("Error reading tag from file", path, "-", err)
+		}
+		return m.Picture() != nil
+	}
+	//beego.Warn("File not found:", path)
+	return false
 }
 
 func unescape(str string) string {
@@ -55,4 +167,15 @@ func unescape(str string) string {
 	return s
 }
 
+func realArtistName(t *itl.Track) string {
+	switch {
+	case t.Compilation:
+		return "Various Artists"
+	case t.AlbumArtist != "":
+		return t.AlbumArtist
+	}
+
+	return t.Artist
+}
+
 var _ Scanner = (*ItunesScanner)(nil)