diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 8c5fd0f29..989331bcb 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -271,7 +271,6 @@ from .howstuffworks import HowStuffWorksIE from .huffpost import HuffPostIE from .hypem import HypemIE from .iconosquare import IconosquareIE -from .ifeng import IfengIE from .ign import ( IGNIE, OneUPIE, diff --git a/youtube_dl/extractor/ifeng.py b/youtube_dl/extractor/ifeng.py deleted file mode 100644 index 394a36ccd..000000000 --- a/youtube_dl/extractor/ifeng.py +++ /dev/null @@ -1,52 +0,0 @@ -# coding: utf-8 -from __future__ import unicode_literals - -from .common import InfoExtractor - -class IfengIE(InfoExtractor): - IE_NAME = 'ifeng' - IE_DESC = '凤凰网' - # http://v.ifeng.com/mil/mainland/201601/01d92436-8afe-4af0-82a4-cef889018295.shtml - # http://v.ifeng.com/ent/mingxing/201601/01e29bc2-1e89-41ee-9a91-25d56e2b0740.shtml - _VALID_URL = r'http://v\.ifeng\.com/.+?/(?P[\w\-\d]+)\.shtml' - _TESTS = [{ - 'url': 'http://v.ifeng.com/mil/mainland/201601/01d92436-8afe-4af0-82a4-cef889018295.shtml', - 'info_dict': { - 'id': '01d92436-8afe-4af0-82a4-cef889018295', - 'ext': 'mp4', - 'title': '中国火箭军正式亮相 多支导弹旅携罕见导弹出镜', - } - }, - { - 'url': 'http://v.ifeng.com/ent/mingxing/201601/01e29bc2-1e89-41ee-9a91-25d56e2b0740.shtml', - 'info_dict': { - 'id': '01e29bc2-1e89-41ee-9a91-25d56e2b0740', - 'ext': 'mp4', - 'title': '陈羽凡锁骨骨折 盼早日康复', - }, - } - ] - - def _real_extract(self, url): - video_id = self._match_id(url); - - d = video_id[-2] - dd = video_id[-2:] - - info_doc = self._download_xml( - 'http://v.ifeng.com/video_info_new/%s/%s/%s.xml' % (d, dd, video_id), - video_id, 'fetch video metadata') - - title = info_doc.find('./item').get('Name') - - for element in info_doc.findall('./videos/video[@mediaType=\'mp4\']'): - url = element.get('VideoPlayUrl') - if element.get('type') == '500k': - break - - return { - 'id': video_id, - 'title': title, - 'url': url, - 'ext': 'mp4', - }