|
|
@ -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,10 +210,18 @@ 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]
|
|
|
|
|
|
|
|
# Request missing tracks in chunks to avoid exceeding max HTTP header size,
|
|
|
|
|
|
|
|
# see https://github.com/ytdl-org/youtube-dl/issues/27355
|
|
|
|
|
|
|
|
_TRACKS_PER_CHUNK = 250
|
|
|
|
|
|
|
|
for chunk_num in itertools.count(0):
|
|
|
|
|
|
|
|
start = chunk_num * _TRACKS_PER_CHUNK
|
|
|
|
|
|
|
|
end = start + _TRACKS_PER_CHUNK
|
|
|
|
|
|
|
|
missing_track_ids_req = missing_track_ids[start:end]
|
|
|
|
|
|
|
|
assert missing_track_ids_req
|
|
|
|
missing_tracks = self._call_api(
|
|
|
|
missing_tracks = self._call_api(
|
|
|
|
'track-entries', tld, url, item_id,
|
|
|
|
'track-entries', tld, url, item_id,
|
|
|
|
'Downloading missing tracks JSON', {
|
|
|
|
'Downloading missing tracks JSON chunk %d' % (chunk_num + 1), {
|
|
|
|
'entries': ','.join(missing_track_ids),
|
|
|
|
'entries': ','.join(missing_track_ids_req),
|
|
|
|
'lang': tld,
|
|
|
|
'lang': tld,
|
|
|
|
'external-domain': 'music.yandex.%s' % tld,
|
|
|
|
'external-domain': 'music.yandex.%s' % tld,
|
|
|
|
'overembed': 'false',
|
|
|
|
'overembed': 'false',
|
|
|
@ -220,6 +229,8 @@ class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if missing_tracks:
|
|
|
|
if missing_tracks:
|
|
|
|
tracks.extend(missing_tracks)
|
|
|
|
tracks.extend(missing_tracks)
|
|
|
|
|
|
|
|
if end >= len(missing_track_ids):
|
|
|
|
|
|
|
|
break
|
|
|
|
|
|
|
|
|
|
|
|
return tracks
|
|
|
|
return tracks
|
|
|
|
|
|
|
|
|
|
|
|