MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '765-disc-number-subsonic' into 'master' 

Fix #765: Include disc number in Subsonic responses

See merge request funkwhale/funkwhale!681
This commit is contained in:
Eliot Berriot 2019-03-20 17:16:18 +01:00
parent 12113c6ef2 5715773fa7
commit 8ac38ba7e6
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/funkwhale_api/subsonic/serializers.py
View File

@ -70,6 +70,7 @@ def get_track_data(album, track, upload):
"album": album.title, "album": album.title,
"artist": album.artist.name, "artist": album.artist.name,
"track": track.position or 1, "track": track.position or 1,
"discNumber": track.disc_number or 1,
"contentType": upload.mimetype, "contentType": upload.mimetype,
"suffix": upload.extension or "", "suffix": upload.extension or "",
"duration": upload.duration or 0, "duration": upload.duration or 0,

3
api/tests/subsonic/test_serializers.py
View File

@ -64,7 +64,7 @@ def test_get_artist_serializer(factories):
def test_get_album_serializer(factories): def test_get_album_serializer(factories):
artist = factories["music.Artist"]() artist = factories["music.Artist"]()
album = factories["music.Album"](artist=artist) album = factories["music.Album"](artist=artist)
track = factories["music.Track"](album=album) track = factories["music.Track"](album=album, disc_number=42)
upload = factories["music.Upload"](track=track, bitrate=42000, duration=43, size=44) upload = factories["music.Upload"](track=track, bitrate=42000, duration=43, size=44)
expected = { expected = {
@ -85,6 +85,7 @@ def test_get_album_serializer(factories):
"album": album.title, "album": album.title,
"artist": artist.name, "artist": artist.name,
"track": track.position, "track": track.position,
"discNumber": track.disc_number,
"year": track.album.release_date.year, "year": track.album.release_date.year,
"contentType": upload.mimetype, "contentType": upload.mimetype,
"suffix": upload.extension or "", "suffix": upload.extension or "",

1
changes/changelog.d/765.bugfix Normal file
View File

@ -0,0 +1 @@
Include disc number in Subsonic responses (#765)