aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-06-30 15:04:30 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-06-30 15:04:30 +0200
commitd4e16d3e9736fd4419b8bd2b088b5dec086ae07d (patch)
treee601f9edf24d93aa390486273bd4c9e8a8fcbdd4
parent65dc7d027278d93b4a760dcbf6d19067fb8ff85d (diff)
YouTube playlist fix; closes #365 and #331
-rwxr-xr-xyoutube-dlbin40544 -> 40554 bytes
-rwxr-xr-xyoutube-dl.exebin3989624 -> 3989631 bytes
-rw-r--r--youtube_dl/InfoExtractors.py6
3 files changed, 3 insertions, 3 deletions
diff --git a/youtube-dl b/youtube-dl
index 66e5ff537..d89b5a984 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index 984c92c42..c55f5fa8d 100755
--- a/youtube-dl.exe
+++ b/youtube-dl.exe
Binary files differ
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 0b5d76bdb..baf859ea8 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -1232,7 +1232,7 @@ class YoutubeSearchIE(InfoExtractor):
InfoExtractor.__init__(self, downloader)
def report_download_page(self, query, pagenum):
- """Report attempt to download playlist page with given number."""
+ """Report attempt to download search page with given number."""
query = query.decode(preferredencoding())
self._downloader.to_screen(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
@@ -1468,8 +1468,8 @@ 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&'
- _MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
+ _VIDEO_INDICATOR_TEMPLATE = r'/watch\?v=(.+?)&amp;list=(PL)?%s&'
+ _MORE_PAGES_INDICATOR = r'yt-uix-pager-next'
IE_NAME = u'youtube:playlist'
def __init__(self, downloader=None):