projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Add ability to authenticate with cookies
[youtube-dl]
/
youtube_dl
/
extractor
/
yandexmusic.py
diff --git
a/youtube_dl/extractor/yandexmusic.py
b/youtube_dl/extractor/yandexmusic.py
index b37d0eab66b53ab45ff38dcac91598079f08a275..eb1062142ecbc6a4702f0dc7763c414934fd3645 100644
(file)
--- a/
youtube_dl/extractor/yandexmusic.py
+++ b/
youtube_dl/extractor/yandexmusic.py
@@
-75,6
+75,12
@@
class YandexMusicTrackIE(YandexMusicBaseIE):
% storage_dir,
track_id, 'Downloading track location JSON')
% storage_dir,
track_id, 'Downloading track location JSON')
+ # Each string is now wrapped in a list, this is probably only temporarily thus
+ # supporting both scenarios (see https://github.com/rg3/youtube-dl/issues/10193)
+ for k, v in data.items():
+ if v and isinstance(v, list):
+ data[k] = v[0]
+
key = hashlib.md5(('XGRlBW9FXlekgbPrRHuSiA' + data['path'][1:] + data['s']).encode('utf-8')).hexdigest()
storage = storage_dir.split('.')
key = hashlib.md5(('XGRlBW9FXlekgbPrRHuSiA' + data['path'][1:] + data['s']).encode('utf-8')).hexdigest()
storage = storage_dir.split('.')
@@
-228,7
+234,8
@@
class YandexMusicPlaylistIE(YandexMusicPlaylistBaseIE):
'overembed': 'false',
})['playlist']
'overembed': 'false',
})['playlist']
- tracks, track_ids = playlist['tracks'], map(compat_str, playlist['trackIds'])
+ tracks = playlist['tracks']
+ track_ids = [compat_str(track_id) for track_id in playlist['trackIds']]
# tracks dictionary shipped with playlist.jsx API is limited to 150 tracks,
# missing tracks should be retrieved manually.
# tracks dictionary shipped with playlist.jsx API is limited to 150 tracks,
# missing tracks should be retrieved manually.