From 8b769664c47fb0aa4ceeb2341c61cf72d757c524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Thu, 23 Jan 2014 14:03:14 +0100 Subject: [PATCH] [sina] Recognize http://video.sina.com.cn/v/b/{id}-*.html urls (fixes #2212) --- youtube_dl/extractor/sina.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/youtube_dl/extractor/sina.py b/youtube_dl/extractor/sina.py index 7548696a7..2909ef18b 100644 --- a/youtube_dl/extractor/sina.py +++ b/youtube_dl/extractor/sina.py @@ -13,21 +13,31 @@ from ..utils import ( class SinaIE(InfoExtractor): _VALID_URL = r'''https?://(.*?\.)?video\.sina\.com\.cn/ ( - (.+?/(((?P\d+).html)|(.*?(\#|(vid=))(?P\d+?)($|&)))) + (.+?/(((?P\d+).html)|(.*?(\#|(vid=)|b/)(?P\d+?)($|&|\-)))) | # This is used by external sites like Weibo (api/sinawebApi/outplay.php/(?P.+?)\.swf) ) ''' - _TEST = { - 'url': 'http://video.sina.com.cn/news/vlist/zt/chczlj2013/?opsubject_id=top12#110028898', - 'file': '110028898.flv', - 'md5': 'd65dd22ddcf44e38ce2bf58a10c3e71f', - 'info_dict': { - 'title': '《中国新闻》 朝鲜要求巴拿马立即释放被扣船员', - } - } + _TESTS = [ + { + 'url': 'http://video.sina.com.cn/news/vlist/zt/chczlj2013/?opsubject_id=top12#110028898', + 'file': '110028898.flv', + 'md5': 'd65dd22ddcf44e38ce2bf58a10c3e71f', + 'info_dict': { + 'title': '《中国新闻》 朝鲜要求巴拿马立即释放被扣船员', + } + }, + { + 'url': 'http://video.sina.com.cn/v/b/101314253-1290078633.html', + 'info_dict': { + 'id': '101314253', + 'ext': 'flv', + 'title': '军方提高对朝情报监视级别', + }, + }, + ] @classmethod def suitable(cls, url):