Prevent youtube IE from taking youtube playlists

diff --git a/youtube-dl b/youtube-dl
index 8b525e7d36396466a4780969d4ee47088f111fe7..a525dc41257ac64133a46132d5fc61286976a433 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -1082,7 +1082,7 @@ class InfoExtractor(object):
 class YoutubeIE(InfoExtractor):
        """Information extractor for youtube.com."""
 
-       _VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$'
+       _VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$'
        _LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
        _LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en'
        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
@@ -3626,12 +3626,12 @@ def gen_extractors():
        google_ie = GoogleIE()
        yahoo_ie = YahooIE()
        return [
-               youtube_ie,
-               MetacafeIE(youtube_ie),
-               DailymotionIE(),
                YoutubePlaylistIE(youtube_ie),
                YoutubeUserIE(youtube_ie),
                YoutubeSearchIE(youtube_ie),
+               youtube_ie,
+               MetacafeIE(youtube_ie),
+               DailymotionIE(),
                google_ie,
                GoogleSearchIE(google_ie),
                PhotobucketIE(),