[youtube:channel] Fix automated channel detection
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 8 Dec 2013 06:30:42 +0000 (07:30 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 8 Dec 2013 06:30:42 +0000 (07:30 +0100)
youtube_dl/extractor/youtube.py

index 01715024ccc793e78f3854fb372862f548c33b12..35121e6e52ff54fdae9315174babe68b50c8f6d6 100644 (file)
@@ -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