Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-22 16:44:32 +01:00
Code Issues Releases Wiki Activity

Include channel_title in the channel extra_info

Browse Source
This commit is contained in:
Thomas Coleman 2020-07-20 12:06:16 -07:00
parent c0784dc22d
commit ed007e9f01
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/YoutubeDL.py
View File

@ -866,6 +866,8 @@ class YoutubeDL(object):
# contained in a playlist # contained in a playlist
if ie_result.get('channel_image'): if ie_result.get('channel_image'):
extra_info['channel_image'] = ie_result.get('channel_image') extra_info['channel_image'] = ie_result.get('channel_image')
if ie_result.get('channel_title'):
extra_info['channel_title'] = ie_result.get('channel_title')
return self.extract_info(ie_result['url'], return self.extract_info(ie_result['url'],
download, download,
ie_key=ie_result.get('ie_key'), ie_key=ie_result.get('ie_key'),

7
youtube_dl/extractor/youtube.py
View File

@ -2952,6 +2952,7 @@ class YoutubeChannelIE(YoutubePlaylistBaseInfoExtractor):
channel_id = self._match_id(url) channel_id = self._match_id(url)
url = self._build_template_url(url, channel_id) url = self._build_template_url(url, channel_id)
extra_info = dict()
# Channel by page listing is restricted to 35 pages of 30 items, i.e. 1050 videos total (see #5778) # Channel by page listing is restricted to 35 pages of 30 items, i.e. 1050 videos total (see #5778)
# Workaround by extracting as a playlist if managed to obtain channel playlist URL # Workaround by extracting as a playlist if managed to obtain channel playlist URL
@ -2962,8 +2963,10 @@ class YoutubeChannelIE(YoutubePlaylistBaseInfoExtractor):
if channel_page is False: if channel_page is False:
channel_playlist_id = False channel_playlist_id = False
else: else:
channel_image = self._html_search_meta( extra_info['channel_image'] = self._html_search_meta(
'og:image', channel_page, 'channel image', default=None) 'og:image', channel_page, 'channel image', default=None)
extra_info['channel_title'] = self._html_search_meta(
'og:title', channel_page, 'channel title', default=None)
channel_playlist_id = self._html_search_meta( channel_playlist_id = self._html_search_meta(
'channelId', channel_page, 'channel id', default=None) 'channelId', channel_page, 'channel id', default=None)
if not channel_playlist_id: if not channel_playlist_id:
@ -2978,7 +2981,7 @@ class YoutubeChannelIE(YoutubePlaylistBaseInfoExtractor):
playlist_id = 'UU' + channel_playlist_id[2:] playlist_id = 'UU' + channel_playlist_id[2:]
url_result = self.url_result( url_result = self.url_result(
compat_urlparse.urljoin(url, '/playlist?list=%s' % playlist_id), 'YoutubePlaylist') compat_urlparse.urljoin(url, '/playlist?list=%s' % playlist_id), 'YoutubePlaylist')
url_result['channel_image'] = channel_image url_result.update(extra_info)
return url_result return url_result
channel_page = self._download_webpage(url, channel_id, 'Downloading page #1') channel_page = self._download_webpage(url, channel_id, 'Downloading page #1')