mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-14 17:26:24 +00:00
Support more common YouTube playlist URLs
This commit is contained in:
parent
f74e22ae28
commit
d119b54df6
@ -2096,7 +2096,7 @@ class YahooSearchIE(InfoExtractor):
|
|||||||
class YoutubePlaylistIE(InfoExtractor):
|
class YoutubePlaylistIE(InfoExtractor):
|
||||||
"""Information Extractor for YouTube playlists."""
|
"""Information Extractor for YouTube playlists."""
|
||||||
|
|
||||||
_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:(?:view_play_list|my_playlists|artist)\?.*?(p|a)=|user/.*?/user/|p/)([^&]+).*'
|
_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:(?:view_play_list|my_playlists|artist)\?.*?(p|a)=|user/.*?/user/|p/|user/.*?#[pg]/c/)([0-9A-Za-z]+)(?:/.*?/([0-9A-Za-z_-]+))?.*'
|
||||||
_TEMPLATE_URL = 'http://www.youtube.com/%s?%s=%s&page=%s&gl=US&hl=en'
|
_TEMPLATE_URL = 'http://www.youtube.com/%s?%s=%s&page=%s&gl=US&hl=en'
|
||||||
_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
|
_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
|
||||||
_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
|
_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
|
||||||
@ -2124,6 +2124,11 @@ class YoutubePlaylistIE(InfoExtractor):
|
|||||||
self._downloader.trouble(u'ERROR: invalid url: %s' % url)
|
self._downloader.trouble(u'ERROR: invalid url: %s' % url)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Single video case
|
||||||
|
if mobj.group(3) is not None:
|
||||||
|
self._youtube_ie.extract(mobj.group(3))
|
||||||
|
return
|
||||||
|
|
||||||
# Download playlist pages
|
# Download playlist pages
|
||||||
# prefix is 'p' as default for playlists but there are other types that need extra care
|
# prefix is 'p' as default for playlists but there are other types that need extra care
|
||||||
playlist_prefix = mobj.group(1)
|
playlist_prefix = mobj.group(1)
|
||||||
|
Loading…
Reference in New Issue
Block a user