metadata: refactor New & MatchBestInfo

Author: rolyatsats

bundle.go

@@ -112,7 +112,7 @@ func (a *audioc) skipFolder(path string) bool {
       }
     } else {
       // derive metadata from album folder and see if it matches
-      m := metadata.New(alb, nil)
+      m := metadata.New(alb)
       if m.Info.ToAlbum() == alb {
         return true
       }
@@ -144,7 +144,7 @@ func (a *audioc) processArtwork(file string) error {
 // files to this location. {Info.title} is currently not used, only disc/track.
 func mergeFolderFunc(f string) (int, string) {
   // use metadata to obtain info from filename
-  m := metadata.New(f, nil)
+  m := metadata.New(f)
 
   disc, _ := strconv.Atoi(regexp.MustCompile(`^\d+`).FindString(m.Info.Disc))
   track, _ := strconv.Atoi(regexp.MustCompile(`^\d+`).FindString(m.Info.Track))

file.go

@@ -30,14 +30,17 @@ func (a *audioc) processFile(index int) (*metadata.Metadata, error) {
     i.Album = i.MatchCleanAlbum(a.Config.Album)
   }
 
-  m := metadata.New(a.Files[index], i)
+  m := metadata.New(a.Files[index])
 
-  // call Probe after setting m.Info.Artist
-  err := m.Probe(a.Ffprobe, filepath.Join(a.Config.Dir, a.Files[index]))
+  // info from embedded tags within audio file
+  d, err := a.Ffprobe.GetData(filepath.Join(a.Config.Dir, a.Files[index]))
   if err != nil {
     return m, err
   }
 
+  m.Info, m.Match = m.Info.MatchBestInfo(i,
+    metadata.ProbeTagsToInfo(d.Format.Tags))
+
   // skip if sources match (unless --force)
   if m.Match && !a.Config.Force {
     m.Resultpath = a.Files[index]
@@ -51,6 +54,7 @@ func (a *audioc) processFile(index int) (*metadata.Metadata, error) {
   if a.Config.Collection ||
     (len(fpa) > 2 && fpa[0] == m.Info.Artist && fpa[1] == m.Info.Year) {
 
+    // override with custom resultpath
     m.Resultpath = filepath.Join(m.Info.Artist, m.Info.Year)
   }
 

metadata/metadata.go

@@ -29,15 +29,9 @@ type Ffprober interface {
 }
 
 // filePath used to derive info
-func New(filePath string, i *Info) *Metadata {
-  // create info if not passed as arg
-  if i == nil {
-    i = &Info{}
-  }
-
-  // create new metadata
+func New(filePath string) *Metadata {
   var file string
-  m := &Metadata{ Filepath: filePath, Info: i }
+  m := &Metadata{ Filepath: filePath, Info: &Info{} }
 
   // derive file info if has file extension
   if regexp.MustCompile(`\.[A-Za-z0-9]{1,5}$`).FindString(filePath) != "" {
@@ -56,11 +50,11 @@ func New(filePath string, i *Info) *Metadata {
 }
 
 // build info from ffprobe.Tags
-func probeTagsToInfo(p *ffprobe.Tags) *Info {
+func ProbeTagsToInfo(p *ffprobe.Tags) *Info {
   i := &Info{ Artist: p.Artist, Disc: p.Disc,
     Track: p.Track, Title: p.Title }
 
-  i.Album = i.MatchCleanAlbum(p.Album)
+  i.Album = strings.TrimSpace(i.MatchCleanAlbum(p.Album))
   return i
 }
 
@@ -109,24 +103,6 @@ func (m *Metadata) fromFile(s string) {
   m.Info.Title = matchAlbumOrTitle(s)
 }
 
-func (m *Metadata) Probe(ffp Ffprober, fp string) error {
-  // info from embedded tags within audio file
-  d, err := ffp.GetData(fp)
-  if err != nil {
-    return err
-  }
-
-  // if artist not yet specified, use ffprobe artist tag
-  if m.Info.Artist == "" {
-    m.Info.Artist = d.Format.Tags.Artist
-  }
-
-  // combine info w/ embedded tags
-  m.Info, m.Match = m.Info.matchProbeInfo(probeTagsToInfo(d.Format.Tags))
-
-  return nil
-}
-
 func (i *Info) MatchCleanAlbum(s string) string {
   s = i.matchDiscOnly(s)
   s = i.matchDate(s)
@@ -169,15 +145,25 @@ func (i *Info) ToFile() string {
 
 // compare file & path info against ffprobe.Tags info and combine into best
 // return includes boolean if info sources match (no update necessary)
-func (i *Info) matchProbeInfo(p *Info) (*Info, bool) {
+func (i *Info) MatchBestInfo(c, p *Info) (*Info, bool) {
+  // set custom artist
+  if len(c.Artist) > 0 {
+    i.Artist = c.Artist
+  }
+
+  // set custom album
+  if len(c.Album) > 0 {
+    i.Album = c.Album
+  }
+
   // compare using safeFilename since info is derived from filename
   compare := p
   compare.Album = safeFilename(compare.Album)
   compare.Title = safeFilename(compare.Title)
 
   if *i != *compare {
     // info overrides probe for Artist
-    if p.Artist != i.Artist {
+    if len(p.Artist) == 0 || len(c.Artist) > 0 {
       p.Artist = i.Artist
     }
 
@@ -198,13 +184,10 @@ func (i *Info) matchProbeInfo(p *Info) (*Info, bool) {
       p.Track = i.Track
     }
 
-    // TODO: use album of source that derived the most info
-    p.Album = strings.TrimSpace(p.Album)
-    if len(p.Album) < len(i.Album) {
+    if (len(p.Album) < len(i.Album)) || len(c.Album) > 0 {
       p.Album = i.Album
     }
 
-    // use the longer title
     if len(p.Title) < len(i.Title) {
       p.Title = i.Title
     }

metadata/metadata_test.go

@@ -78,7 +78,8 @@ func TestMatchProbeInfo(t *testing.T) {
   }
 
   for x := range tests {
-    rInfo, match := tests[x].info.matchProbeInfo(probeTagsToInfo(tests[x].tags))
+    rInfo, match := tests[x].info.MatchBestInfo(&Info{},
+      ProbeTagsToInfo(tests[x].tags))
 
     if *rInfo != *tests[x].comb {
       t.Errorf("Expected %v, got %v", rInfo, tests[x].comb)
@@ -98,7 +99,7 @@ func TestInfoFromFile(t *testing.T) {
   }
 
   for x := range tests {
-    m := New(tests[x][0][0], nil)
+    m := New(tests[x][0][0])
     compare := []string{ m.Info.Year, m.Info.Month, m.Info.Day,
       m.Info.Disc, m.Info.Track, m.Info.Title }
     if strings.Join(compare, "\n") != strings.Join(tests[x][1], "\n") {
@@ -118,7 +119,7 @@ func TestInfoFromPath(t *testing.T) {
   }
 
   for x := range tests {
-    m := New(tests[x][0][0], nil)
+    m := New(tests[x][0][0])
     compare := []string{ m.Info.Year, m.Info.Month, m.Info.Day, m.Info.Album }
     if strings.Join(compare, "\n") != strings.Join(tests[x][1], "\n") {
       t.Errorf("Expected %v, got %v", tests[x][1], compare)