From: Philipp Hagemeister Date: Mon, 9 Dec 2013 03:49:32 +0000 (+0100) Subject: Merge remote-tracking branch 'jaimeMF/yt-toplists' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ffa8f0df0a878463078467709f615b1e57c61ec1;p=youtube-dl Merge remote-tracking branch 'jaimeMF/yt-toplists' --- ffa8f0df0a878463078467709f615b1e57c61ec1 diff --cc youtube_dl/extractor/youtube.py index 7f7508c74,a1a4d896d..874429b78 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@@ -1569,9 -1573,12 +1569,12 @@@ class YoutubePlaylistIE(YoutubeBaseInfo else: self.to_screen(u'Downloading playlist PL%s - add --no-playlist to just download video %s' % (playlist_id, video_id)) - if len(playlist_id) == 13: # 'RD' + 11 characters for the video id + if playlist_id.startswith('RD'): # Mixes require a custom extraction process return self._extract_mix(playlist_id) + if playlist_id.startswith('TL'): + raise ExtractorError(u'For downloading YouTube.com top lists, use ' + u'the "yttoplist" keyword, for example "youtube-dl \'yttoplist:music:Top Tracks\'"', expected=True) # Extract the video ids from the playlist pages ids = []