Merge branch 'junzh0u-youku-multi-page-playlist' into develop

This commit is contained in:
Mort Yao 2015-09-14 23:15:59 +02:00
commit d2ebe7690d

View File

@ -74,6 +74,11 @@ class Youku(VideoExtractor):
video_page = get_content('http://www.youku.com/playlist_show/id_%s' % playlist_id) video_page = get_content('http://www.youku.com/playlist_show/id_%s' % playlist_id)
videos = set(re.findall(r'href="(http://v\.youku\.com/[^?"]+)', video_page)) videos = set(re.findall(r'href="(http://v\.youku\.com/[^?"]+)', video_page))
for extra_page_url in set(re.findall('href="(http://www\.youku\.com/playlist_show/id_%s_[^?"]+)' % playlist_id, video_page)):
extra_page = get_content(extra_page_url)
videos |= set(re.findall(r'href="(http://v\.youku\.com/[^?"]+)', extra_page))
self.title = re.search(r'<meta name="title" content="([^"]+)"', video_page).group(1) self.title = re.search(r'<meta name="title" content="([^"]+)"', video_page).group(1)
self.p_playlist() self.p_playlist()
for video in videos: for video in videos: