Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions streamrip/client/deezer.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,30 @@ async def get_album(self, item_id: str) -> dict:
return album_metadata

async def get_playlist(self, item_id: str) -> dict:
pl_metadata, pl_tracks = await asyncio.gather(
asyncio.to_thread(self.client.api.get_playlist, item_id),
asyncio.to_thread(self.client.api.get_playlist_tracks, item_id),
)
pl_metadata["tracks"] = pl_tracks["data"]
pl_metadata["track_total"] = len(pl_tracks["data"])
return pl_metadata
try:
pl_metadata, pl_tracks = await asyncio.gather(
asyncio.to_thread(self.client.api.get_playlist, item_id),
asyncio.to_thread(self.client.api.get_playlist_tracks, item_id),
)
pl_metadata["tracks"] = pl_tracks["data"]
pl_metadata["track_total"] = len(pl_tracks["data"])
return pl_metadata
except deezer.errors.PermissionException:
logger.debug(
"Public API permission error for playlist %s; falling back to GW API.",
item_id,
)
gw_page, gw_tracks = await asyncio.gather(
asyncio.to_thread(self.client.gw.get_playlist_page, item_id),
asyncio.to_thread(self.client.gw.get_playlist_tracks, item_id),
)
title = gw_page.get("DATA", {}).get("TITLE", f"Deezer Playlist {item_id}")
tracks = [{"id": t["SNG_ID"], **t} for t in gw_tracks]
return {
"title": title,
"tracks": tracks,
"track_total": len(tracks),
}

async def get_artist(self, item_id: str) -> dict:
artist, albums = await asyncio.gather(
Expand Down
31 changes: 31 additions & 0 deletions tests/test_deezer_private_playlist.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from types import SimpleNamespace

import deezer.errors
import pytest

from streamrip.client.deezer import DeezerClient
from streamrip.metadata.playlist import PlaylistMetadata


@pytest.mark.asyncio
async def test_get_playlist_falls_back_to_gw_on_permission_exception():
def raise_perm(_item_id):
raise deezer.errors.PermissionException("OAuthException code 200")

fake_api = SimpleNamespace(
get_playlist=raise_perm,
get_playlist_tracks=raise_perm,
)
fake_gw = SimpleNamespace(
get_playlist_page=lambda _id: {"DATA": {"TITLE": "Private Mix"}},
get_playlist_tracks=lambda _id: [{"SNG_ID": "111"}, {"SNG_ID": "222"}],
)

client = DeezerClient.__new__(DeezerClient)
client.client = SimpleNamespace(api=fake_api, gw=fake_gw)

resp = await client.get_playlist("999")
meta = PlaylistMetadata.from_deezer(resp)
assert meta.name == "Private Mix"
assert meta.tracks == ["111", "222"]
assert resp["track_total"] == 2