move tags up a level

its not messily tied to scanner anymore

scanner/scanner.go

@@ -19,7 +19,7 @@ import (
 	"github.com/rainycape/unidecode"
 
 	"go.senan.xyz/gonic/db"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
+	"go.senan.xyz/gonic/tags/tagcommon"
 )
 
 var (

scanner/tags/tagcommon/tagcommmon.go

@@ -1,91 +0,0 @@
-package tagcommon
-
-import (
-	"errors"
-)
-
-var ErrUnsupported = errors.New("filetype unsupported")
-
-type Reader interface {
-	CanRead(absPath string) bool
-	Read(absPath string) (Info, error)
-}
-
-type Info interface {
-	Title() string
-	BrainzID() string
-	Artist() string
-	Album() string
-	AlbumArtist() string
-	AlbumArtists() []string
-	AlbumBrainzID() string
-	Genre() string
-	Genres() []string
-	TrackNumber() int
-	DiscNumber() int
-	Length() int
-	Bitrate() int
-	Year() int
-}
-
-func MustAlbum(p Info) string {
-	if r := p.Album(); r != "" {
-		return r
-	}
-	return "Unknown Album"
-}
-
-func MustArtist(p Info) string {
-	if r := p.Artist(); r != "" {
-		return r
-	}
-	return "Unknown Artist"
-}
-
-func MustAlbumArtist(p Info) string {
-	if r := p.AlbumArtist(); r != "" {
-		return r
-	}
-	return MustArtist(p)
-}
-
-func MustAlbumArtists(p Info) []string {
-	if r := p.AlbumArtists(); len(r) > 0 {
-		return r
-	}
-	return []string{MustAlbumArtist(p)}
-}
-
-func MustGenre(p Info) string {
-	if r := p.Genre(); r != "" {
-		return r
-	}
-	return "Unknown Genre"
-}
-
-func MustGenres(p Info) []string {
-	if r := p.Genres(); len(r) > 0 {
-		return r
-	}
-	return []string{MustGenre(p)}
-}
-
-type ChainReader []Reader
-
-func (cr ChainReader) CanRead(absPath string) bool {
-	for _, reader := range cr {
-		if reader.CanRead(absPath) {
-			return true
-		}
-	}
-	return false
-}
-
-func (cr ChainReader) Read(absPath string) (Info, error) {
-	for _, reader := range cr {
-		if reader.CanRead(absPath) {
-			return reader.Read(absPath)
-		}
-	}
-	return nil, ErrUnsupported
-}

scanner/tags/taglib/taglib.go

@@ -1,82 +0,0 @@
-package taglib
-
-import (
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/sentriz/audiotags"
-	"go.senan.xyz/gonic/scanner/tags/tagcommon"
-)
-
-type TagLib struct{}
-
-func (TagLib) CanRead(absPath string) bool {
-	switch ext := filepath.Ext(absPath); ext {
-	case ".mp3", ".flac", ".aac", ".m4a", ".m4b", ".ogg", ".opus", ".wma", ".wav", ".wv":
-		return true
-	}
-	return false
-}
-
-func (TagLib) Read(absPath string) (tagcommon.Info, error) {
-	raw, props, err := audiotags.Read(absPath)
-	return &info{raw, props}, err
-}
-
-type info struct {
-	raw   map[string][]string
-	props *audiotags.AudioProperties
-}
-
-// https://picard-docs.musicbrainz.org/downloads/MusicBrainz_Picard_Tag_Map.html
-
-func (i *info) Title() string          { return first(find(i.raw, "title")) }
-func (i *info) BrainzID() string       { return first(find(i.raw, "musicbrainz_trackid")) } // musicbrainz recording ID
-func (i *info) Artist() string         { return first(find(i.raw, "artist")) }
-func (i *info) Album() string          { return first(find(i.raw, "album")) }
-func (i *info) AlbumArtist() string    { return first(find(i.raw, "albumartist", "album artist")) }
-func (i *info) AlbumArtists() []string { return find(i.raw, "albumartists", "album_artists") }
-func (i *info) AlbumBrainzID() string  { return first(find(i.raw, "musicbrainz_albumid")) } // musicbrainz release ID
-func (i *info) Genre() string          { return first(find(i.raw, "genre")) }
-func (i *info) Genres() []string       { return find(i.raw, "genres") }
-func (i *info) TrackNumber() int       { return intSep("/", first(find(i.raw, "tracknumber"))) }                  // eg. 5/12
-func (i *info) DiscNumber() int        { return intSep("/", first(find(i.raw, "discnumber"))) }                   // eg. 1/2
-func (i *info) Year() int              { return intSep("-", first(find(i.raw, "originaldate", "date", "year"))) } // eg. 2023-12-01
-func (i *info) Length() int            { return i.props.Length }
-func (i *info) Bitrate() int           { return i.props.Bitrate }
-
-func first[T comparable](is []T) T {
-	var z T
-	for _, i := range is {
-		if i != z {
-			return i
-		}
-	}
-	return z
-}
-
-func find(m map[string][]string, keys ...string) []string {
-	for _, k := range keys {
-		if r := filterStr(m[k]); len(r) > 0 {
-			return r
-		}
-	}
-	return nil
-}
-
-func filterStr(ss []string) []string {
-	var r []string
-	for _, s := range ss {
-		if strings.TrimSpace(s) != "" {
-			r = append(r, s)
-		}
-	}
-	return r
-}
-
-func intSep(sep, in string) int {
-	start, _, _ := strings.Cut(in, sep)
-	out, _ := strconv.Atoi(start)
-	return out
-}