X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fyouku.py;h=996d384784cb827ed4baa3304b61782542ea0767;hb=37b6d5f684d409365bbac6d3f2b8074b57e643a8;hp=ed43f42be59faa0cc1ec61b12767b19463529f3b;hpb=9c286cfa004d18da196a6961ffda30bb9bf57515;p=youtube-dl diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py index ed43f42be..996d38478 100644 --- a/youtube_dl/extractor/youku.py +++ b/youtube_dl/extractor/youku.py @@ -1,3 +1,5 @@ +# coding: utf-8 + import json import math import random @@ -11,7 +13,17 @@ from ..utils import ( class YoukuIE(InfoExtractor): - _VALID_URL = r'(?:http://)?v\.youku\.com/v_show/id_(?P[A-Za-z0-9]+)\.html' + _VALID_URL = r'(?:http://)?(v|player)\.youku\.com/(v_show/id_|player\.php/sid/)(?P[A-Za-z0-9]+)(\.html|/v.swf)' + _TEST = { + u"url": u"http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html", + u"file": u"XNDgyMDQ2NTQw_part00.flv", + u"md5": u"ffe3f2e435663dc2d1eea34faeff5b5b", + u"params": { u"test": False }, + u"info_dict": { + u"title": u"youtube-dl test video \"'/\\ä↭𝕐" + } + } + def _gen_sid(self): nowTime = int(time.time() * 1000)