aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2011-09-16 22:31:31 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2011-09-16 22:31:31 +0200
commit1cde6f1d528d95f15b6138fa6a4658789628ab9d (patch)
treeb6ebc9f9cbc54cf56bc06cd66c05e17d5f79aeab
parent2d8acd8039af34260b98db5f6bc5d2532a82f91a (diff)
Prevent youtube IE from taking youtube playlists
-rwxr-xr-xyoutube-dl8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube-dl b/youtube-dl
index 8b525e7d3..a525dc412 100755
--- 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(),