aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-09-27 11:42:58 -0700
committerPhilipp Hagemeister <phihag@phihag.de>2012-09-27 11:42:58 -0700
commit8ca21983d87a65a81ae182b64daa791169a5615e (patch)
treebf643c881b41a5a3fb6db850682a431808a4e1b1 /youtube_dl
parent20326b8b1bfd7ba29bafc099f21a9b2e10c01776 (diff)
parent3af2f7656ceef5960cf2a7b5cfdb0bd97f22d103 (diff)
downloadyoutube-dl-8ca21983d87a65a81ae182b64daa791169a5615e.tar.xz
Merge pull request #432 from cryzed/master
Fixed YouTube playlist parsing
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/InfoExtractors.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index ff5c47726..6442888d8 100644
--- 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=(.+?)&amp;list=(PL)?%s&'
+ _VIDEO_INDICATOR_TEMPLATE = r'/watch\?v=(.+?)&amp;list=.*?%s'
_MORE_PAGES_INDICATOR = r'yt-uix-pager-next'
IE_NAME = u'youtube:playlist'