Merge 733a0a0b18
into d65d89183f
This commit is contained in:
commit
d1c21a7397
|
@ -241,6 +241,8 @@ class InfoExtractor(object):
|
|||
fields. This depends on a particular extractor.
|
||||
channel_id: Id of the channel.
|
||||
channel_url: Full URL to a channel webpage.
|
||||
channel_verified: If the channel is verified (e.g. has checkmark badge on
|
||||
YouTube)
|
||||
location: Physical location where the video was filmed.
|
||||
subtitles: The available subtitles as a dictionary in the format
|
||||
{tag: subformats}. "tag" is usually a language code, and
|
||||
|
|
|
@ -566,6 +566,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
|
||||
'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
|
||||
'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
|
||||
'channel_verified': False,
|
||||
'upload_date': '20121002',
|
||||
'description': 'test chars: "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
|
||||
'categories': ['Science & Technology'],
|
||||
|
@ -598,6 +599,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
'creator': 'Icona Pop',
|
||||
'track': 'I Love It (feat. Charli XCX)',
|
||||
'artist': 'Icona Pop',
|
||||
'channel_verified': True,
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -614,6 +616,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
'uploader': 'justintimberlakeVEVO',
|
||||
'uploader_id': 'justintimberlakeVEVO',
|
||||
'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/justintimberlakeVEVO',
|
||||
'channel_verified': True,
|
||||
'creator': 'Justin Timberlake',
|
||||
'track': 'Tunnel Vision',
|
||||
'artist': 'Justin Timberlake',
|
||||
|
@ -689,6 +692,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
'uploader': 'AfrojackVEVO',
|
||||
'uploader_id': 'AfrojackVEVO',
|
||||
'upload_date': '20131011',
|
||||
'channel_verified': True,
|
||||
},
|
||||
'params': {
|
||||
'youtube_include_dash_manifest': True,
|
||||
|
@ -2265,6 +2269,10 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
r'data-channel-external-id=(["\'])(?P<id>(?:(?!\1).)+)\1',
|
||||
video_webpage, 'channel id', default=None, group='id'))
|
||||
channel_url = 'http://www.youtube.com/channel/%s' % channel_id if channel_id else None
|
||||
channel_verified = re.search(
|
||||
r'<span.*(?:data-tooltip-text="Verified"|class=".*yt-channel-title-icon-verified[^"]+")',
|
||||
video_webpage
|
||||
) is not None
|
||||
|
||||
thumbnails = []
|
||||
thumbnails_list = try_get(
|
||||
|
@ -2526,6 +2534,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
'uploader_url': video_uploader_url,
|
||||
'channel_id': channel_id,
|
||||
'channel_url': channel_url,
|
||||
'channel_verified': channel_verified,
|
||||
'upload_date': upload_date,
|
||||
'license': video_license,
|
||||
'creator': video_creator or artist,
|
||||
|
|
Loading…
Reference in New Issue