From af27af3a8748d465197d826c8159c81253e63e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=99=AF?= Date: Wed, 17 Dec 2014 11:02:22 +0800 Subject: [PATCH] match vid more precisely --- src/you_get/extractors/youku.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/you_get/extractors/youku.py b/src/you_get/extractors/youku.py index 09b06a61..dca76b58 100755 --- a/src/you_get/extractors/youku.py +++ b/src/you_get/extractors/youku.py @@ -55,14 +55,18 @@ class Youku(VideoExtractor): def get_vid_from_url(url): """Extracts video ID from URL. """ - 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'loader\.swf\?VideoIDS=([\w=]+)') + # 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'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): """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): self.url = url