summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Garcia <sarbalap+freshmeat@gmail.com>2009-06-09 20:19:29 +0200
committerRicardo Garcia <sarbalap+freshmeat@gmail.com>2010-10-31 11:24:40 +0100
commit113e5266cc6d5616aadb1a70590ebe6107d2b524 (patch)
treed5a4985a4da021b8ffbc610a43ca5190f498d548
parent55e7c75e122261c97af78a89d07a244c09bddbc8 (diff)
downloadyoutube-dl-113e5266cc6d5616aadb1a70590ebe6107d2b524.tar.gz
youtube-dl-113e5266cc6d5616aadb1a70590ebe6107d2b524.tar.xz
youtube-dl-113e5266cc6d5616aadb1a70590ebe6107d2b524.zip
Modify "more pages" check in YouTube playlist (fixes issue #29)
-rwxr-xr-xyoutube-dl4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube-dl b/youtube-dl
index 1d9f955e2..9bbecf7d4 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -956,7 +956,7 @@ class YoutubePlaylistIE(InfoExtractor):
 	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/view_play_list\?p=(.+)'
 	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
 	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
-	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&amp;page=%s'
+	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
 	_youtube_ie = None
 
 	def __init__(self, youtube_ie, downloader=None):
@@ -1002,7 +1002,7 @@ class YoutubePlaylistIE(InfoExtractor):
 					ids_in_page.append(mobj.group(1))
 			video_ids.extend(ids_in_page)
 
-			if (self._MORE_PAGES_INDICATOR % (playlist_id, pagenum + 1)) not in page:
+			if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page:
 				break
 			pagenum = pagenum + 1