|
@ -1978,10 +1978,13 @@ class YoutubeChannelIE(YoutubePlaylistBaseInfoExtractor): |
|
|
return (False if YoutubePlaylistsIE.suitable(url) or YoutubeLiveIE.suitable(url) |
|
|
return (False if YoutubePlaylistsIE.suitable(url) or YoutubeLiveIE.suitable(url) |
|
|
else super(YoutubeChannelIE, cls).suitable(url)) |
|
|
else super(YoutubeChannelIE, cls).suitable(url)) |
|
|
|
|
|
|
|
|
|
|
|
def _build_template_url(self, url, channel_id): |
|
|
|
|
|
return self._TEMPLATE_URL % channel_id |
|
|
|
|
|
|
|
|
def _real_extract(self, url): |
|
|
def _real_extract(self, url): |
|
|
channel_id = self._match_id(url) |
|
|
channel_id = self._match_id(url) |
|
|
|
|
|
|
|
|
url = self._TEMPLATE_URL % channel_id |
|
|
|
|
|
|
|
|
url = self._build_template_url(url, channel_id) |
|
|
|
|
|
|
|
|
# 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 |
|
@ -2038,8 +2041,8 @@ class YoutubeChannelIE(YoutubePlaylistBaseInfoExtractor): |
|
|
|
|
|
|
|
|
class YoutubeUserIE(YoutubeChannelIE): |
|
|
class YoutubeUserIE(YoutubeChannelIE): |
|
|
IE_DESC = 'YouTube.com user videos (URL or "ytuser" keyword)' |
|
|
IE_DESC = 'YouTube.com user videos (URL or "ytuser" keyword)' |
|
|
_VALID_URL = r'(?:(?:https?://(?:\w+\.)?youtube\.com/(?:user/|c/)?(?!(?:attribution_link|watch|results)(?:$|[^a-z_A-Z0-9-])))|ytuser:)(?!feed/)(?P<id>[A-Za-z0-9_-]+)' |
|
|
|
|
|
_TEMPLATE_URL = 'https://www.youtube.com/user/%s/videos' |
|
|
|
|
|
|
|
|
_VALID_URL = r'(?:(?:https?://(?:\w+\.)?youtube\.com/(?:(?P<user>user|c)/)?(?!(?:attribution_link|watch|results)(?:$|[^a-z_A-Z0-9-])))|ytuser:)(?!feed/)(?P<id>[A-Za-z0-9_-]+)' |
|
|
|
|
|
_TEMPLATE_URL = 'https://www.youtube.com/%s/%s/videos' |
|
|
IE_NAME = 'youtube:user' |
|
|
IE_NAME = 'youtube:user' |
|
|
|
|
|
|
|
|
_TESTS = [{ |
|
|
_TESTS = [{ |
|
@ -2049,12 +2052,24 @@ class YoutubeUserIE(YoutubeChannelIE): |
|
|
'id': 'UUfX55Sx5hEFjoC3cNs6mCUQ', |
|
|
'id': 'UUfX55Sx5hEFjoC3cNs6mCUQ', |
|
|
'title': 'Uploads from The Linux Foundation', |
|
|
'title': 'Uploads from The Linux Foundation', |
|
|
} |
|
|
} |
|
|
|
|
|
}, { |
|
|
|
|
|
# Only available via https://www.youtube.com/c/12minuteathlete/videos |
|
|
|
|
|
# but not https://www.youtube.com/user/12minuteathlete/videos |
|
|
|
|
|
'url': 'https://www.youtube.com/c/12minuteathlete/videos', |
|
|
|
|
|
'playlist_mincount': 249, |
|
|
|
|
|
'info_dict': { |
|
|
|
|
|
'id': 'UUVjM-zV6_opMDx7WYxnjZiQ', |
|
|
|
|
|
'title': 'Uploads from 12 Minute Athlete', |
|
|
|
|
|
} |
|
|
}, { |
|
|
}, { |
|
|
'url': 'ytuser:phihag', |
|
|
'url': 'ytuser:phihag', |
|
|
'only_matching': True, |
|
|
'only_matching': True, |
|
|
}, { |
|
|
}, { |
|
|
'url': 'https://www.youtube.com/c/gametrailers', |
|
|
'url': 'https://www.youtube.com/c/gametrailers', |
|
|
'only_matching': True, |
|
|
'only_matching': True, |
|
|
|
|
|
}, { |
|
|
|
|
|
'url': 'https://www.youtube.com/gametrailers', |
|
|
|
|
|
'only_matching': True, |
|
|
}, { |
|
|
}, { |
|
|
# This channel is not available. |
|
|
# This channel is not available. |
|
|
'url': 'https://www.youtube.com/user/kananishinoSMEJ/videos', |
|
|
'url': 'https://www.youtube.com/user/kananishinoSMEJ/videos', |
|
@ -2071,6 +2086,10 @@ class YoutubeUserIE(YoutubeChannelIE): |
|
|
else: |
|
|
else: |
|
|
return super(YoutubeUserIE, cls).suitable(url) |
|
|
return super(YoutubeUserIE, cls).suitable(url) |
|
|
|
|
|
|
|
|
|
|
|
def _build_template_url(self, url, channel_id): |
|
|
|
|
|
mobj = re.match(self._VALID_URL, url) |
|
|
|
|
|
return self._TEMPLATE_URL % (mobj.group('user') or 'user', mobj.group('id')) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class YoutubeLiveIE(YoutubeBaseInfoExtractor): |
|
|
class YoutubeLiveIE(YoutubeBaseInfoExtractor): |
|
|
IE_DESC = 'YouTube.com live streams' |
|
|
IE_DESC = 'YouTube.com live streams' |
|
|