mirror of
https://github.com/l1ving/youtube-dl
synced 2025-02-11 05:53:17 +08:00
Improved playlist parsing
This commit is contained in:
parent
fc96af00fd
commit
4294898628
@ -1471,7 +1471,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_-]+))?.*'
|
_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'
|
_TEMPLATE_URL = 'http://www.youtube.com/%s?%s=%s&page=%s&gl=US&hl=en'
|
||||||
_VIDEO_INDICATOR = r'/watch\?v=(.+?)&list=(.+?)&'
|
_VIDEO_INDICATOR_TEMPLATE = r'/watch\?v=(.+?)&list=SP%s'
|
||||||
_MORE_PAGES_INDICATOR = r'yt-uix-pager-next'
|
_MORE_PAGES_INDICATOR = r'yt-uix-pager-next'
|
||||||
IE_NAME = u'youtube:playlist'
|
IE_NAME = u'youtube:playlist'
|
||||||
|
|
||||||
@ -1518,8 +1518,8 @@ class YoutubePlaylistIE(InfoExtractor):
|
|||||||
|
|
||||||
# Extract video identifiers
|
# Extract video identifiers
|
||||||
ids_in_page = []
|
ids_in_page = []
|
||||||
for mobj in re.finditer(self._VIDEO_INDICATOR, page):
|
for mobj in re.finditer(self._VIDEO_INDICATOR_TEMPLATE % playlist_id, page):
|
||||||
if mobj.group(1) not in ids_in_page and mobj.group(2)[2:] == playlist_id:
|
if mobj.group(1) not in ids_in_page:
|
||||||
ids_in_page.append(mobj.group(1))
|
ids_in_page.append(mobj.group(1))
|
||||||
video_ids.extend(ids_in_page)
|
video_ids.extend(ids_in_page)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user