youtube-dl

commit 8ca21983d87a65a81ae182b64daa791169a5615e
parent 20326b8b1bfd7ba29bafc099f21a9b2e10c01776
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Thu, 27 Sep 2012 11:42:58 -0700

Merge pull request #432 from cryzed/master

Fixed YouTube playlist parsing
Diffstat:
M
youtube_dl/InfoExtractors.py
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
@@ -1473,7 +1473,7 @@ class YoutubePlaylistIE(InfoExtractor):
 
 	_VALID_URL = r'(?:https?://)?(?:\w+\.)?youtube\.com/(?:(?:course|view_play_list|my_playlists|artist|playlist)\?.*?(p|a|list)=|user/.*?/user/|p/|user/.*?#[pg]/c/)(?:PL)?([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_TEMPLATE = r'/watch\?v=(.+?)&list=(PL)?%s&'
+	_VIDEO_INDICATOR_TEMPLATE = r'/watch\?v=(.+?)&list=.*?%s'
 	_MORE_PAGES_INDICATOR = r'yt-uix-pager-next'
 	IE_NAME = u'youtube:playlist'