diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-01 15:16:35 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-01 15:16:35 +0100 |
| commit | 437cac8cc18e541dd1c4c55ef1b19de7d6529ae9 (patch) | |
| tree | 7aa5c0701db60827203245fb5e61394fd1229cad | |
| parent | 9f281cacd2bb1de0dc11dac35685f04dcb5f447c (diff) | |
[sina] Modernize and simplify
| -rw-r--r-- | youtube_dl/extractor/sina.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/youtube_dl/extractor/sina.py b/youtube_dl/extractor/sina.py index a63d126d4..0891a441f 100644 --- a/youtube_dl/extractor/sina.py +++ b/youtube_dl/extractor/sina.py @@ -11,7 +11,7 @@ from ..compat import ( class SinaIE(InfoExtractor): - _VALID_URL = r'''https?://(.*?\.)?video\.sina\.com\.cn/ + _VALID_URL = r'''(?x)https?://(.*?\.)?video\.sina\.com\.cn/ ( (.+?/(((?P<pseudo_id>\d+).html)|(.*?(\#|(vid=)|b/)(?P<id>\d+?)($|&|\-)))) | @@ -23,9 +23,10 @@ class SinaIE(InfoExtractor): _TESTS = [ { 'url': 'http://video.sina.com.cn/news/vlist/zt/chczlj2013/?opsubject_id=top12#110028898', - 'file': '110028898.flv', 'md5': 'd65dd22ddcf44e38ce2bf58a10c3e71f', 'info_dict': { + 'id': '110028898', + 'ext': 'flv', 'title': '《中国新闻》 朝鲜要求巴拿马立即释放被扣船员', } }, @@ -39,10 +40,6 @@ class SinaIE(InfoExtractor): }, ] - @classmethod - def suitable(cls, url): - return re.match(cls._VALID_URL, url, flags=re.VERBOSE) is not None - def _extract_video(self, video_id): data = compat_urllib_parse.urlencode({'vid': video_id}) url_doc = self._download_xml('http://v.iask.com/v_play.php?%s' % data, @@ -59,7 +56,7 @@ class SinaIE(InfoExtractor): } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url, flags=re.VERBOSE) + mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') if mobj.group('token') is not None: # The video id is in the redirected url |