From: Philipp Hagemeister Date: Sun, 8 Dec 2013 06:30:42 +0000 (+0100) Subject: [youtube:channel] Fix automated channel detection X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=31812a9e0e13925bc4d266a6d8eff779e10816c5;p=youtube-dl [youtube:channel] Fix automated channel detection --- diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 01715024c..35121e6e5 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1631,10 +1631,11 @@ class YoutubeChannelIE(InfoExtractor): video_ids = [] url = 'https://www.youtube.com/channel/%s/videos' % channel_id channel_page = self._download_webpage(url, channel_id) - if re.search(r'channel-header-autogenerated-label', channel_page) is not None: - autogenerated = True - else: - autogenerated = False + autogenerated = re.search(r'''(?x) + class="[^"]*?(?: + channel-header-autogenerated-label| + yt-channel-title-autogenerated + )[^"]*"''', channel_page) is not None if autogenerated: # The videos are contained in a single page