|
|
|
@ -1051,7 +1051,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|
|
|
<a\s[^>]*\bhref="(?P<url>https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"
|
|
|
|
<a\s[^>]*\bhref="(?P<url>https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"
|
|
|
|
\s[^>]*\bclass="[^"]*\blazy-load-youtube''',
|
|
|
|
\s[^>]*\bclass="[^"]*\blazy-load-youtube''',
|
|
|
|
]
|
|
|
|
]
|
|
|
|
_RETURN_TYPE = 'video' # While there are "multifeed" test cases, they don't seem to actually exist anymore
|
|
|
|
_RETURN_TYPE = 'video' # XXX: How to handle multifeed?
|
|
|
|
|
|
|
|
|
|
|
|
_PLAYER_INFO_RE = (
|
|
|
|
_PLAYER_INFO_RE = (
|
|
|
|
r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/player',
|
|
|
|
r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/player',
|
|
|
|
@ -1582,66 +1582,99 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|
|
|
'skip': 'This live event has ended.',
|
|
|
|
'skip': 'This live event has ended.',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
# Multifeed videos (multiple cameras), URL is for Main Camera
|
|
|
|
# Multifeed videos (multiple cameras), URL can be of any Camera
|
|
|
|
'url': 'https://www.youtube.com/watch?v=jvGDaLqkpTg',
|
|
|
|
'url': 'https://www.youtube.com/watch?v=zaPI8MvL8pg',
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': 'jvGDaLqkpTg',
|
|
|
|
'id': 'zaPI8MvL8pg',
|
|
|
|
'title': 'Tom Clancy Free Weekend Rainbow Whatever',
|
|
|
|
'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04',
|
|
|
|
'description': 'md5:e03b909557865076822aa169218d6a5d',
|
|
|
|
'description': 'md5:563ccbc698b39298481ca3c571169519',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
'playlist': [{
|
|
|
|
'playlist': [{
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': 'jvGDaLqkpTg',
|
|
|
|
'id': 'j5yGuxZ8lLU',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'title': 'Tom Clancy Free Weekend Rainbow Whatever (Main Camera)',
|
|
|
|
'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Chris)',
|
|
|
|
'description': 'md5:e03b909557865076822aa169218d6a5d',
|
|
|
|
'uploader': 'WiiLikeToPlay',
|
|
|
|
'duration': 10643,
|
|
|
|
'description': 'md5:563ccbc698b39298481ca3c571169519',
|
|
|
|
'upload_date': '20161111',
|
|
|
|
'uploader_url': 'http://www.youtube.com/user/WiiRikeToPray',
|
|
|
|
'uploader': 'Team PGP',
|
|
|
|
'duration': 10120,
|
|
|
|
'uploader_id': 'UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'channel_follower_count': int,
|
|
|
|
'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
|
|
|
|
},
|
|
|
|
'availability': 'public',
|
|
|
|
}, {
|
|
|
|
'playable_in_embed': True,
|
|
|
|
'info_dict': {
|
|
|
|
'upload_date': '20131105',
|
|
|
|
'id': '3AKt1R1aDnw',
|
|
|
|
'uploader_id': 'WiiRikeToPray',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'categories': ['Gaming'],
|
|
|
|
'title': 'Tom Clancy Free Weekend Rainbow Whatever (Camera 2)',
|
|
|
|
'live_status': 'was_live',
|
|
|
|
'description': 'md5:e03b909557865076822aa169218d6a5d',
|
|
|
|
'tags': 'count:24',
|
|
|
|
'duration': 10991,
|
|
|
|
'release_timestamp': 1383701910,
|
|
|
|
'upload_date': '20161111',
|
|
|
|
'thumbnail': 'https://i.ytimg.com/vi/j5yGuxZ8lLU/maxresdefault.jpg',
|
|
|
|
'uploader': 'Team PGP',
|
|
|
|
'comment_count': int,
|
|
|
|
'uploader_id': 'UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'age_limit': 0,
|
|
|
|
'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'like_count': int,
|
|
|
|
|
|
|
|
'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
|
|
|
|
|
|
|
|
'channel': 'WiiLikeToPlay',
|
|
|
|
|
|
|
|
'view_count': int,
|
|
|
|
|
|
|
|
'release_date': '20131106',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}, {
|
|
|
|
}, {
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': 'RtAMM00gpVc',
|
|
|
|
'id': 'zaPI8MvL8pg',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'title': 'Tom Clancy Free Weekend Rainbow Whatever (Camera 3)',
|
|
|
|
'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Tyson)',
|
|
|
|
'description': 'md5:e03b909557865076822aa169218d6a5d',
|
|
|
|
'uploader_id': 'WiiRikeToPray',
|
|
|
|
'duration': 10995,
|
|
|
|
'availability': 'public',
|
|
|
|
'upload_date': '20161111',
|
|
|
|
'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
|
|
|
|
'uploader': 'Team PGP',
|
|
|
|
'channel': 'WiiLikeToPlay',
|
|
|
|
'uploader_id': 'UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'uploader_url': 'http://www.youtube.com/user/WiiRikeToPray',
|
|
|
|
'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'channel_follower_count': int,
|
|
|
|
|
|
|
|
'description': 'md5:563ccbc698b39298481ca3c571169519',
|
|
|
|
|
|
|
|
'duration': 10108,
|
|
|
|
|
|
|
|
'age_limit': 0,
|
|
|
|
|
|
|
|
'like_count': int,
|
|
|
|
|
|
|
|
'tags': 'count:24',
|
|
|
|
|
|
|
|
'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
|
|
|
|
|
|
|
|
'uploader': 'WiiLikeToPlay',
|
|
|
|
|
|
|
|
'release_timestamp': 1383701915,
|
|
|
|
|
|
|
|
'comment_count': int,
|
|
|
|
|
|
|
|
'upload_date': '20131105',
|
|
|
|
|
|
|
|
'thumbnail': 'https://i.ytimg.com/vi/zaPI8MvL8pg/maxresdefault.jpg',
|
|
|
|
|
|
|
|
'release_date': '20131106',
|
|
|
|
|
|
|
|
'playable_in_embed': True,
|
|
|
|
|
|
|
|
'live_status': 'was_live',
|
|
|
|
|
|
|
|
'categories': ['Gaming'],
|
|
|
|
|
|
|
|
'view_count': int,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}, {
|
|
|
|
}, {
|
|
|
|
'info_dict': {
|
|
|
|
'info_dict': {
|
|
|
|
'id': '6N2fdlP3C5U',
|
|
|
|
'id': 'R7r3vfO7Hao',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'ext': 'mp4',
|
|
|
|
'title': 'Tom Clancy Free Weekend Rainbow Whatever (Camera 4)',
|
|
|
|
'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Spencer)',
|
|
|
|
'description': 'md5:e03b909557865076822aa169218d6a5d',
|
|
|
|
'thumbnail': 'https://i.ytimg.com/vi/R7r3vfO7Hao/maxresdefault.jpg',
|
|
|
|
'duration': 10990,
|
|
|
|
'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
|
|
|
|
'upload_date': '20161111',
|
|
|
|
'like_count': int,
|
|
|
|
'uploader': 'Team PGP',
|
|
|
|
'availability': 'public',
|
|
|
|
'uploader_id': 'UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'playable_in_embed': True,
|
|
|
|
'uploader_url': r're:https?://(?:www\.)?youtube\.com/channel/UChORY56LMMETTuGjXaJXvLg',
|
|
|
|
'upload_date': '20131105',
|
|
|
|
|
|
|
|
'description': 'md5:563ccbc698b39298481ca3c571169519',
|
|
|
|
|
|
|
|
'uploader_id': 'WiiRikeToPray',
|
|
|
|
|
|
|
|
'uploader_url': 'http://www.youtube.com/user/WiiRikeToPray',
|
|
|
|
|
|
|
|
'channel_follower_count': int,
|
|
|
|
|
|
|
|
'tags': 'count:24',
|
|
|
|
|
|
|
|
'release_date': '20131106',
|
|
|
|
|
|
|
|
'uploader': 'WiiLikeToPlay',
|
|
|
|
|
|
|
|
'comment_count': int,
|
|
|
|
|
|
|
|
'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
|
|
|
|
|
|
|
|
'channel': 'WiiLikeToPlay',
|
|
|
|
|
|
|
|
'categories': ['Gaming'],
|
|
|
|
|
|
|
|
'release_timestamp': 1383701914,
|
|
|
|
|
|
|
|
'live_status': 'was_live',
|
|
|
|
|
|
|
|
'age_limit': 0,
|
|
|
|
|
|
|
|
'duration': 10128,
|
|
|
|
|
|
|
|
'view_count': int,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}],
|
|
|
|
}],
|
|
|
|
'params': {
|
|
|
|
'params': {'skip_download': True},
|
|
|
|
'skip_download': True,
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
'skip': 'Not multifeed anymore',
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
# Multifeed video with comma in title (see https://github.com/ytdl-org/youtube-dl/issues/8536)
|
|
|
|
# Multifeed video with comma in title (see https://github.com/ytdl-org/youtube-dl/issues/8536)
|
|
|
|
|
pukkandan
2 years ago