marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-07-03 00:21:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support disc numbers

Browse source
This commit is contained in:
Philipp Wolfer 2023-11-22 12:05:00 +01:00
parent d810fc9cac
commit 0e3061e837
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
12 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/funkwhale/funkwhale.go
View file

@ -151,6 +151,7 @@ func (l Listening) ToListen() models.Listen {
ReleaseName: track.Album.Title,
ArtistNames: []string{track.Artist.Name},
TrackNumber: track.Position,
DiscNumber: track.DiscNumber,
RecordingMbid: models.MBID(track.RecordingMbid),
ReleaseMbid: models.MBID(track.Album.ReleaseMbid),
ArtistMbids: []models.MBID{models.MBID(track.Artist.ArtistMbid)},
@ -184,6 +185,7 @@ func (f FavoriteTrack) ToLove() models.Love {
ReleaseName: track.Album.Title,
ArtistNames: []string{track.Artist.Name},
TrackNumber: track.Position,
DiscNumber: track.DiscNumber,
RecordingMbid: recordingMbid,
ReleaseMbid: models.MBID(track.Album.ReleaseMbid),
ArtistMbids: []models.MBID{models.MBID(track.Artist.ArtistMbid)},

2
backends/funkwhale/funkwhale_test.go
View file

@ -70,6 +70,7 @@ func TestFunkwhaleListeningToListen(t *testing.T) {
assert.Equal(fwListen.Track.Album.Title, listen.ReleaseName)
assert.Equal([]string{fwListen.Track.Artist.Name}, listen.ArtistNames)
assert.Equal(fwListen.Track.Position, listen.Track.TrackNumber)
assert.Equal(fwListen.Track.DiscNumber, listen.Track.DiscNumber)
assert.Equal(fwListen.Track.Tags, listen.Track.Tags)
// assert.Equal(backends.FunkwhaleClientName, listen.AdditionalInfo["disc_number"])
assert.Equal(models.MBID(fwListen.Track.RecordingMbid), listen.RecordingMbid)
@ -114,6 +115,7 @@ func TestFunkwhaleFavoriteTrackToLove(t *testing.T) {
assert.Equal(favorite.Track.Album.Title, love.ReleaseName)
assert.Equal([]string{favorite.Track.Artist.Name}, love.ArtistNames)
assert.Equal(favorite.Track.Position, love.Track.TrackNumber)
assert.Equal(favorite.Track.DiscNumber, love.Track.DiscNumber)
assert.Equal(favorite.Track.Tags, love.Track.Tags)
assert.Equal(models.MBID(favorite.Track.RecordingMbid), love.RecordingMbid)
assert.Equal(models.MBID(favorite.Track.RecordingMbid), love.Track.RecordingMbid)