Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix listenbrainz track length submission and include submission client details #424

Merged
merged 3 commits into from Dec 10, 2023
Merged

Fix listenbrainz track length submission and include submission client details #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d12f8
Fixed ListenBrainz track duration submission
phw Dec 10, 2023
4e9852d
Include submission client info in ListenBrainz payload
phw Dec 10, 2023
845072d
Extended ListenBrainz test
phw Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions listenbrainz/listenbrainz.go
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ import (
"net/http/httputil"
"time"

"go.senan.xyz/gonic"
"go.senan.xyz/gonic/db"
"go.senan.xyz/gonic/scrobble"
)
Expand Down Expand Up @@ -44,9 +45,10 @@ func (c *Client) Scrobble(user db.User, track scrobble.Track, stamp time.Time, s
payload := &Payload{
TrackMetadata: &TrackMetadata{
AdditionalInfo: &AdditionalInfo{
TrackNumber: int(track.TrackNumber),
RecordingMBID: track.MusicBrainzID,
TrackLength: int(track.Duration.Seconds()),
TrackNumber: int(track.TrackNumber),
RecordingMBID: track.MusicBrainzID,
Duration: int(track.Duration.Seconds()),
SubmissionClient: gonic.Name,
},
ArtistName: track.Artist,
TrackName: track.Track,
Expand Down
9 changes: 8 additions & 1 deletion listenbrainz/listenbrainz_test.go
View file
Open in desktop
Expand Up @@ -37,7 +37,14 @@ func TestScrobble(t *testing.T) {

err := client.Scrobble(
db.User{ListenBrainzURL: "https://listenbrainz.org", ListenBrainzToken: "token1"},
scrobble.Track{Track: "title", Artist: "artist", Album: "album", TrackNumber: 1},
scrobble.Track{
Track: "title",
Artist: "artist",
Album: "album",
TrackNumber: 1,
Duration: 242 * time.Second,
MusicBrainzID: "00000000-0000-0000-0000-000000000000",
},
time.Unix(1683804525, 0),
true,
)
Expand Down
9 changes: 5 additions & 4 deletions listenbrainz/model.go
View file
Open in desktop
Expand Up @@ -9,10 +9,11 @@ type (
}

AdditionalInfo struct {
TrackNumber int `json:"tracknumber,omitempty"`
TrackMBID string `json:"track_mbid,omitempty"`
RecordingMBID string `json:"recording_mbid,omitempty"`
TrackLength int `json:"track_length,omitempty"`
TrackNumber int `json:"tracknumber,omitempty"`
TrackMBID string `json:"track_mbid,omitempty"`
RecordingMBID string `json:"recording_mbid,omitempty"`
Duration int `json:"duration,omitempty"`
SubmissionClient string `json:"submission_client,omitempty"`
}

TrackMetadata struct {
Expand Down
5 changes: 4 additions & 1 deletion listenbrainz/testdata/submit_listens_request.json
View file
Open in desktop
Expand Up @@ -5,7 +5,10 @@
"listened_at": 1683804525,
"track_metadata": {
"additional_info": {
"tracknumber": 1
"tracknumber": 1,
"duration": 242,
"recording_mbid": "00000000-0000-0000-0000-000000000000",
"submission_client": "gonic"
},
"artist_name": "artist",
"track_name": "title",
Expand Down