commit 802622ac1c76ddd2ede5899a62601c15cf8a18e3 parent e0e56865a0caf52dcc3c8fa7897c94bc292ab91a Author: Philipp Hagemeister <phihag@phihag.de> Date: Wed, 31 Aug 2011 21:28:44 +0200 Merge remote-tracking branch 'wise86/master' Diffstat:
| M | youtube-dl | | | 2 | +- |
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube-dl b/youtube-dl @@ -2401,7 +2401,7 @@ class YahooSearchIE(InfoExtractor): class YoutubePlaylistIE(InfoExtractor): """Information Extractor for YouTube playlists.""" - _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:(?:view_play_list|my_playlists|artist)\?.*?(p|a)=|user/.*?/user/|p/|user/.*?#[pg]/c/)([0-9A-Za-z]+)(?:/.*?/([0-9A-Za-z_-]+))?.*' + _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:(?:view_play_list|my_playlists|artist|playlist)\?.*?(p|a|list)=|user/.*?/user/|p/|user/.*?#[pg]/c/)([0-9A-Za-z]+)(?:/.*?/([0-9A-Za-z_-]+))?.*' _TEMPLATE_URL = 'http://www.youtube.com/%s?%s=%s&page=%s&gl=US&hl=en' _VIDEO_INDICATOR = r'/watch\?v=(.+?)&' _MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'