Merge remote-tracking branch 'jaimeMF/yt-toplists'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:49:32 +0000 (04:49 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 9 Dec 2013 03:49:32 +0000 (04:49 +0100)
1  2 
youtube_dl/extractor/__init__.py
youtube_dl/extractor/youtube.py

Simple merge
index 7f7508c74f1b98de4d93ee51472d0b32f9184e98,a1a4d896debdf8fd7c38fa38d3ad95023e12302e..874429b78cc4917ca1cbbec7245c85436dd73783
@@@ -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 = []