commit: 31812a9e0e13925bc4d266a6d8eff779e10816c5
parent 11bf848191e6a2859f2e53dd7639305e0446e821
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 8 Dec 2013 07:30:42 +0100
[youtube:channel] Fix automated channel detection
Diffstat:
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git 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