Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7d94c06743
2 changed files with 15 additions and 2 deletions
|
@ -36,6 +36,9 @@ class LA7IE(InfoExtractor):
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
video_id = self._match_id(url)
|
video_id = self._match_id(url)
|
||||||
|
|
||||||
|
if not url.startswith('http'):
|
||||||
|
url = '%s//%s' % (self.http_scheme(), url)
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
|
|
||||||
player_data = self._search_regex(
|
player_data = self._search_regex(
|
||||||
|
|
|
@ -2631,6 +2631,12 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
|
||||||
_VIDEO_RE_TPL = r'href="\s*/watch\?v=%s(?:&(?:[^"]*?index=(?P<index>\d+))?(?:[^>]+>(?P<title>[^<]+))?)?'
|
_VIDEO_RE_TPL = r'href="\s*/watch\?v=%s(?:&(?:[^"]*?index=(?P<index>\d+))?(?:[^>]+>(?P<title>[^<]+))?)?'
|
||||||
_VIDEO_RE = _VIDEO_RE_TPL % r'(?P<id>[0-9A-Za-z_-]{11})'
|
_VIDEO_RE = _VIDEO_RE_TPL % r'(?P<id>[0-9A-Za-z_-]{11})'
|
||||||
IE_NAME = 'youtube:playlist'
|
IE_NAME = 'youtube:playlist'
|
||||||
|
_YTM_PLAYLIST_PREFIX = 'RDCLAK5uy_'
|
||||||
|
_YTM_CHANNEL_INFO = {
|
||||||
|
'uploader': 'Youtube Music',
|
||||||
|
'uploader_id': 'music', # or "UC-9-kyTW8ZkZNDHQJ6FgpwQ"
|
||||||
|
'uploader_url': 'https://www.youtube.com/music'
|
||||||
|
}
|
||||||
_TESTS = [{
|
_TESTS = [{
|
||||||
'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
|
'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
@ -2940,6 +2946,8 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
|
||||||
'uploader_id': uploader_id,
|
'uploader_id': uploader_id,
|
||||||
'uploader_url': uploader_url,
|
'uploader_url': uploader_url,
|
||||||
})
|
})
|
||||||
|
if playlist_id.startswith(self._YTM_PLAYLIST_PREFIX):
|
||||||
|
playlist.update(self._YTM_CHANNEL_INFO)
|
||||||
|
|
||||||
return has_videos, playlist
|
return has_videos, playlist
|
||||||
|
|
||||||
|
@ -2970,7 +2978,9 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
|
||||||
return video
|
return video
|
||||||
|
|
||||||
if playlist_id.startswith(('RD', 'UL', 'PU')):
|
if playlist_id.startswith(('RD', 'UL', 'PU')):
|
||||||
# Mixes require a custom extraction process
|
if not playlist_id.startswith(self._YTM_PLAYLIST_PREFIX):
|
||||||
|
# Mixes require a custom extraction process,
|
||||||
|
# Youtube Music playlists act like normal playlists (with randomized order)
|
||||||
return self._extract_mix(playlist_id)
|
return self._extract_mix(playlist_id)
|
||||||
|
|
||||||
has_videos, playlist = self._extract_playlist(playlist_id)
|
has_videos, playlist = self._extract_playlist(playlist_id)
|
||||||
|
|
Loading…
Reference in a new issue