[yandexmusic:playlist] Request missing tracks in chunks (closes #27355, closes #28184)

This commit is contained in:
Sergey M․ 2021-02-17 04:03:54 +07:00
parent 646052e416
commit a363fb5d28
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 23 additions and 12 deletions

View File

@ -1,8 +1,9 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
import hashlib import hashlib
import itertools
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_str from ..compat import compat_str
@ -209,17 +210,27 @@ class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
missing_track_ids = [ missing_track_ids = [
track_id for track_id in track_ids track_id for track_id in track_ids
if track_id not in present_track_ids] if track_id not in present_track_ids]
missing_tracks = self._call_api( # Request missing tracks in chunks to avoid exceeding max HTTP header size,
'track-entries', tld, url, item_id, # see https://github.com/ytdl-org/youtube-dl/issues/27355
'Downloading missing tracks JSON', { _TRACKS_PER_CHUNK = 250
'entries': ','.join(missing_track_ids), for chunk_num in itertools.count(0):
'lang': tld, start = chunk_num * _TRACKS_PER_CHUNK
'external-domain': 'music.yandex.%s' % tld, end = start + _TRACKS_PER_CHUNK
'overembed': 'false', missing_track_ids_req = missing_track_ids[start:end]
'strict': 'true', assert missing_track_ids_req
}) missing_tracks = self._call_api(
if missing_tracks: 'track-entries', tld, url, item_id,
tracks.extend(missing_tracks) 'Downloading missing tracks JSON chunk %d' % (chunk_num + 1), {
'entries': ','.join(missing_track_ids_req),
'lang': tld,
'external-domain': 'music.yandex.%s' % tld,
'overembed': 'false',
'strict': 'true',
})
if missing_tracks:
tracks.extend(missing_tracks)
if end >= len(missing_track_ids):
break
return tracks return tracks