fix: track needs Public() client; fix album partner API structure parsing
- Song() requires a client instance as first arg; pass Public() for unauthenticated access
- Album response is data.albumUnion.{name,artists,coverArt,tracks.items} not flat keys
- Add per-field debug logging for track and album responses
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
6bedd3ed28
commit
67185b85e9
1 file changed
+35
-12
+35
-12
@@ -64,13 +64,18 @@ def resolve(sp_type, sp_id):
|
|||||||
url = f'https://open.spotify.com/{sp_type}/{sp_id}'
|
url = f'https://open.spotify.com/{sp_type}/{sp_id}'
|
||||||
|
|
||||||
if sp_type == 'track':
|
if sp_type == 'track':
|
||||||
cls_name = next((n for n in ('PublicSong', 'Song', 'PublicTrack', 'Track') if n in available), None)
|
# Song requires a client instance as first arg; Public() is the unauthenticated client
|
||||||
if not cls_name:
|
public = sp_mod.Public()
|
||||||
raise Exception(f'spotapi has no track class (available: {available})')
|
song = sp_mod.Song(public, url)
|
||||||
song = getattr(sp_mod, cls_name)(url)
|
|
||||||
raw = song.get_song_info()
|
raw = song.get_song_info()
|
||||||
eprint(f'[spotapi] track raw keys: {list(raw.keys()) if isinstance(raw, dict) else type(raw)}')
|
eprint(f'[spotapi] track raw type={type(raw).__name__} keys={list(raw.keys()) if isinstance(raw, dict) else "?"}')
|
||||||
tr = _parse_track(raw) or {
|
if isinstance(raw, dict):
|
||||||
|
for k, v in raw.items():
|
||||||
|
eprint(f'[spotapi] track[{k!r}] = {repr(v)[:120]}')
|
||||||
|
# Partner API nests track under data.trackUnion
|
||||||
|
d = raw.get('data') or {}
|
||||||
|
tu = d.get('trackUnion') or d
|
||||||
|
tr = _parse_track({'itemV2': {'data': {'trackUnion': tu}}}) or {
|
||||||
'trackName': raw.get('name', ''),
|
'trackName': raw.get('name', ''),
|
||||||
'artistName': raw.get('artist', ''),
|
'artistName': raw.get('artist', ''),
|
||||||
'collectionName': raw.get('album', ''),
|
'collectionName': raw.get('album', ''),
|
||||||
@@ -91,12 +96,30 @@ def resolve(sp_type, sp_id):
|
|||||||
alb = getattr(sp_mod, cls_name)(url)
|
alb = getattr(sp_mod, cls_name)(url)
|
||||||
alb_info = alb.get_album_info()
|
alb_info = alb.get_album_info()
|
||||||
eprint(f'[spotapi] album raw type={type(alb_info).__name__} keys={list(alb_info.keys()) if isinstance(alb_info, dict) else "?"}')
|
eprint(f'[spotapi] album raw type={type(alb_info).__name__} keys={list(alb_info.keys()) if isinstance(alb_info, dict) else "?"}')
|
||||||
meta = alb_info if isinstance(alb_info, dict) else {}
|
if isinstance(alb_info, dict):
|
||||||
name = meta.get('name', '')
|
for k, v in alb_info.items():
|
||||||
artist = meta.get('artist', '') or meta.get('artists', '')
|
eprint(f'[spotapi] alb[{k!r}] = {repr(v)[:160]}')
|
||||||
art = meta.get('image', '') or meta.get('cover', '')
|
# Partner API: data.albumUnion.{name, artists, coverArt, tracks.items[]}
|
||||||
raw_tracks = meta.get('tracks') or meta.get('items') or (alb_info if isinstance(alb_info, list) else [])
|
d = (alb_info.get('data') or {}) if isinstance(alb_info, dict) else {}
|
||||||
tracks = [t for t in (_parse_track(i) for i in raw_tracks) if t]
|
au = d.get('albumUnion') or d.get('albumV2') or (alb_info if isinstance(alb_info, dict) else {})
|
||||||
|
name = au.get('name', '')
|
||||||
|
# artist(s)
|
||||||
|
artist_items = (au.get('artists') or {}).get('items') or []
|
||||||
|
artist = ', '.join(
|
||||||
|
(a.get('profile') or {}).get('name', '') or a.get('name', '') for a in artist_items
|
||||||
|
) or au.get('artist', '')
|
||||||
|
# artwork
|
||||||
|
cover_items = (au.get('coverArt') or {}).get('sources') or (au.get('images') or {}).get('items') or []
|
||||||
|
art = cover_items[0].get('url', '') if cover_items else ''
|
||||||
|
# tracks
|
||||||
|
raw_tracks = (au.get('tracks') or {}).get('items') or []
|
||||||
|
# album track items look like {uid, track: {data: {trackUnion: {...}}}}
|
||||||
|
def _alb_track(item):
|
||||||
|
inner = item.get('track') or item
|
||||||
|
return _parse_track(inner,
|
||||||
|
default_album=name, default_art=art,
|
||||||
|
default_artist=artist)
|
||||||
|
tracks = [t for t in (_alb_track(i) for i in raw_tracks) if t]
|
||||||
eprint(f'[spotapi] album ok — {len(tracks)} tracks')
|
eprint(f'[spotapi] album ok — {len(tracks)} tracks')
|
||||||
return {'type': 'album', 'name': name, 'artist': artist, 'artworkUrl': art, 'tracks': tracks}
|
return {'type': 'album', 'name': name, 'artist': artist, 'artworkUrl': art, 'tracks': tracks}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user