diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2011-08-31 21:28:44 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2011-08-31 21:28:44 +0200 |
| commit | 802622ac1c76ddd2ede5899a62601c15cf8a18e3 (patch) | |
| tree | 1fc4f3c7df05e5e72743f0be0f768f44594953ea | |
| parent | e0e56865a0caf52dcc3c8fa7897c94bc292ab91a (diff) | |
| parent | 2152ee8601b7abe0481217f5de4950f268e24d08 (diff) | |
Merge remote-tracking branch 'wise86/master'
| -rwxr-xr-x | youtube-dl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube-dl b/youtube-dl index c919c4016..68c9bc429 100755 --- 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>' |