diff options
author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-01-23 14:03:14 +0100 |
---|---|---|
committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-01-23 14:03:14 +0100 |
commit | 8b769664c47fb0aa4ceeb2341c61cf72d757c524 (patch) | |
tree | 3228653f90f34e8557d8e24ee19c98689426d99d /youtube_dl/extractor/sina.py | |
parent | 76f270a46a47c7df2d75ca8da437c12c729fc380 (diff) |
[sina] Recognize http://video.sina.com.cn/v/b/{id}-*.html urls (fixes #2212)
Diffstat (limited to 'youtube_dl/extractor/sina.py')
-rw-r--r-- | youtube_dl/extractor/sina.py | 28 |
1 files 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<pseudo_id>\d+).html)|(.*?(\#|(vid=))(?P<id>\d+?)($|&)))) + (.+?/(((?P<pseudo_id>\d+).html)|(.*?(\#|(vid=)|b/)(?P<id>\d+?)($|&|\-)))) | # This is used by external sites like Weibo (api/sinawebApi/outplay.php/(?P<token>.+?)\.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): |