|
|
|
@ -1572,7 +1572,6 @@ class YoutubePlaylistIE(InfoExtractor):
|
|
|
|
|
class YoutubeChannelIE(InfoExtractor):
|
|
|
|
|
IE_DESC = u'YouTube.com channels'
|
|
|
|
|
_VALID_URL = r"^(?:https?://)?(?:youtu\.be|(?:\w+\.)?youtube(?:-nocookie)?\.com)/channel/([0-9A-Za-z_-]+)"
|
|
|
|
|
_TEMPLATE_URL = 'http://www.youtube.com/channel/%s/videos?sort=da&flow=list&view=0&page=%s&gl=US&hl=en'
|
|
|
|
|
_MORE_PAGES_INDICATOR = 'yt-uix-load-more'
|
|
|
|
|
_MORE_PAGES_URL = 'http://www.youtube.com/c4_browse_ajax?action_load_more_videos=1&flow=list&paging=%s&view=0&sort=da&channel_id=%s'
|
|
|
|
|
IE_NAME = u'youtube:channel'
|
|
|
|
@ -1593,18 +1592,8 @@ class YoutubeChannelIE(InfoExtractor):
|
|
|
|
|
# Download channel page
|
|
|
|
|
channel_id = mobj.group(1)
|
|
|
|
|
video_ids = []
|
|
|
|
|
pagenum = 1
|
|
|
|
|
|
|
|
|
|
url = self._TEMPLATE_URL % (channel_id, pagenum)
|
|
|
|
|
page = self._download_webpage(url, channel_id,
|
|
|
|
|
u'Downloading page #%s' % pagenum)
|
|
|
|
|
|
|
|
|
|
# Extract video identifiers
|
|
|
|
|
ids_in_page = self.extract_videos_from_page(page)
|
|
|
|
|
video_ids.extend(ids_in_page)
|
|
|
|
|
|
|
|
|
|
# Download any subsequent channel pages using the json-based channel_ajax query
|
|
|
|
|
if self._MORE_PAGES_INDICATOR in page:
|
|
|
|
|
# Download all channel pages using the json-based channel_ajax query
|
|
|
|
|
for pagenum in itertools.count(1):
|
|
|
|
|
url = self._MORE_PAGES_URL % (pagenum, channel_id)
|
|
|
|
|
page = self._download_webpage(url, channel_id,
|
|
|
|
|