heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

scan musicbrainz album id to db and scrobble with it

Browse Source
This commit is contained in:
sentriz
2019-07-08 23:17:15 +01:00
parent 8437068e96
commit 35a4f5b42c
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
model/model.go
View File

@@ -94,6 +94,7 @@ type Album struct {
TagArtistID int `sql:"default: null; type:int REFERENCES artists(id) ON DELETE CASCADE"`
TagTitle string `sql:"default: null"`
TagTitleUDec string `sql:"default: null"`
TagBrainzID string `sql:"default: null"`
TagYear int `sql:"default: null"`
Tracks []*Track
ChildCount int `sql:"-"`

1
scanner/scanner.go
View File

@@ -347,6 +347,7 @@ func (s *Scanner) handleTrack(it *item) error {
}
folder.TagTitle = trTags.Album()
folder.TagTitleUDec = decoded(trTags.Album())
folder.TagBrainzID = trTags.AlbumBrainzID()
folder.TagYear = trTags.Year()
folder.TagArtistID = artist.ID
folder.ReceivedTags = true

19
scanner/tags/tags.go
View File

@@ -33,15 +33,16 @@ func (t *Tags) firstTag(keys ...string) string {
return ""
}
func (t *Tags) Title() string { return t.firstTag("title") }
func (t *Tags) Artist() string { return t.firstTag("artist") }
func (t *Tags) Album() string { return t.firstTag("album") }
func (t *Tags) AlbumArtist() string { return t.firstTag("albumartist", "album artist") }
func (t *Tags) Year() int { return intSep(t.firstTag("date", "year"), "-") } // eg. 2019-6-11
func (t *Tags) TrackNumber() int { return intSep(t.firstTag("tracknumber"), "/") } // eg. 5/12
func (t *Tags) DiscNumber() int { return intSep(t.firstTag("discnumber"), "/") } // eg. 1/2
func (t *Tags) Length() int { return t.props.Length }
func (t *Tags) Bitrate() int { return t.props.Bitrate }
func (t *Tags) Title() string { return t.firstTag("title") }
func (t *Tags) Artist() string { return t.firstTag("artist") }
func (t *Tags) Album() string { return t.firstTag("album") }
func (t *Tags) AlbumArtist() string { return t.firstTag("albumartist", "album artist") }
func (t *Tags) AlbumBrainzID() string { return t.firstTag("musicbrainz_albumid") }
func (t *Tags) Year() int { return intSep(t.firstTag("date", "year"), "-") } // eg. 2019-6-11
func (t *Tags) TrackNumber() int { return intSep(t.firstTag("tracknumber"), "/") } // eg. 5/12
func (t *Tags) DiscNumber() int { return intSep(t.firstTag("discnumber"), "/") } // eg. 1/2
func (t *Tags) Length() int { return t.props.Length }
func (t *Tags) Bitrate() int { return t.props.Bitrate }
func intSep(in, sep string) int {
if in == "" {

BIN
server/handler/test_data/db
View File

Binary file not shown.

5
server/lastfm/lastfm.go
View File

@@ -50,9 +50,10 @@ func Scrobble(apiKey, secret, session string, track *model.Track,
params.Add("sk", session)
params.Add("artist", track.TagTrackArtist)
params.Add("track", track.TagTitle)
params.Add("album", track.Album.TagTitle)
params.Add("albumArtist", track.Artist.Name)
params.Add("trackNumber", strconv.Itoa(track.TagTrackNumber))
params.Add("album", track.Album.TagTitle)
params.Add("mbid", track.Album.TagBrainzID)
params.Add("albumArtist", track.Artist.Name)
params.Add("api_sig", getParamSignature(params, secret))
_, err := makeRequest("POST", params)
return err