match vid more precisely

This commit is contained in:
邓景 2014-12-17 11:02:22 +08:00
parent 2add0b8bc5
commit af27af3a87

View File

@ -55,14 +55,18 @@ class Youku(VideoExtractor):
def get_vid_from_url(url): def get_vid_from_url(url):
"""Extracts video ID from URL. """Extracts video ID from URL.
""" """
return match1(url, r'youku\.com/v_show/id_([\w=]+)') or \ # return match1(url, r'youku\.com/v_show/id_([\w=]+)') or \
match1(url, r'player\.youku\.com/player\.php/sid/([\w=]+)/v\.swf') or \ # match1(url, r'player\.youku\.com/player\.php/sid/([\w=]+)/v\.swf') or \
match1(url, r'loader\.swf\?VideoIDS=([\w=]+)') # match1(url, r'loader\.swf\?VideoIDS=([\w=]+)')
return match1(url, r'youku\.com/v_show/id_([a-zA-Z0-9=]+)') or \
match1(url, r'player\.youku\.com/player\.php/sid/([a-zA-Z0-9=]+)/v\.swf') or \
match1(url, r'loader\.swf\?VideoIDS=([a-zA-Z0-9=]+)')
def get_playlist_id_from_url(url): def get_playlist_id_from_url(url):
"""Extracts playlist ID from URL. """Extracts playlist ID from URL.
""" """
return match1(url, r'youku\.com/playlist_show/id_([\w=]+)') # return match1(url, r'youku\.com/playlist_show/id_([\w=]+)')
return match1(url, r'youku\.com/playlist_show/id_([a-zA-Z0-9=]+)')
def download_playlist_by_url(self, url, **kwargs): def download_playlist_by_url(self, url, **kwargs):
self.url = url self.url = url