From: Ricardo Garcia Date: Fri, 2 Apr 2010 17:51:54 +0000 (+0200) Subject: Change method to detect end of playlist (fixes issue #113) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ce5cafea407319ce9a69acabeb748563cc0d7db0;p=youtube-dl Change method to detect end of playlist (fixes issue #113) --- diff --git a/youtube-dl b/youtube-dl index 957438b1d..3735c7eac 100755 --- a/youtube-dl +++ b/youtube-dl @@ -1496,7 +1496,7 @@ class YoutubePlaylistIE(InfoExtractor): _VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?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&page=%s' + _MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*' _youtube_ie = None def __init__(self, youtube_ie, downloader=None): @@ -1542,7 +1542,7 @@ class YoutubePlaylistIE(InfoExtractor): ids_in_page.append(mobj.group(1)) video_ids.extend(ids_in_page) - if (self._MORE_PAGES_INDICATOR % (playlist_id.upper(), pagenum + 1)) not in page: + if re.search(self._MORE_PAGES_INDICATOR, page) is None: break pagenum = pagenum + 1