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

Merge branch '867-subsonic-default-transcoding-again' into 'master' 

Resolve "Provide a default format when transcoding via Subsonic"

See merge request funkwhale/funkwhale!819
This commit is contained in:
Eliot Berriot 2019-07-04 10:35:24 +02:00
parent 5e18333135 38ab05195b
commit be561c0ca0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/subsonic/views.py
View File

@ -256,7 +256,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
if max_bitrate: if max_bitrate:
max_bitrate = max_bitrate * 1000 max_bitrate = max_bitrate * 1000
format = data.get("format", "raw") or None format = data.get("format") or None
if max_bitrate and not format: if max_bitrate and not format:
# specific bitrate requested, but no format specified # specific bitrate requested, but no format specified
# so we use a default one, cf #867. This helps with clients # so we use a default one, cf #867. This helps with clients

9
api/tests/subsonic/test_views.py
View File

@ -288,15 +288,16 @@ def test_stream_transcode(
mocker, mocker,
settings, settings,
): ):
upload = factories["music.Upload"](playable=True)
params = {"id": upload.track.pk, "maxBitRate": max_bitrate}
if format:
params["format"] = format
settings.SUBSONIC_DEFAULT_TRANSCODING_FORMAT = default_transcoding_format settings.SUBSONIC_DEFAULT_TRANSCODING_FORMAT = default_transcoding_format
url = reverse("api:subsonic-stream") url = reverse("api:subsonic-stream")
mocked_serve = mocker.patch.object( mocked_serve = mocker.patch.object(
music_views, "handle_serve", return_value=Response() music_views, "handle_serve", return_value=Response()
) )
upload = factories["music.Upload"](playable=True) response = logged_in_api_client.get(url, params)
response = logged_in_api_client.get(
url, {"id": upload.track.pk, "maxBitRate": max_bitrate, "format": format}
)
mocked_serve.assert_called_once_with( mocked_serve.assert_called_once_with(
upload=upload, upload=upload,

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

@ -0,0 +1 @@
Fixed remaining transcoding issue with Subsonic API (#867)