diff options
author | Philipp Hagemeister <[email protected]> | 2013-11-20 06:35:02 +0100 |
---|---|---|
committer | Philipp Hagemeister <[email protected]> | 2013-11-20 06:35:02 +0100 |
commit | 8f053519846d8758de4e3ad67960e4161407d334 (patch) | |
tree | edb362251e69dd4a23939a1e435c2710862b2d4f | |
parent | 4eb92208a3bf05d0860e1f138380e8b5cae20c14 (diff) | |
download | youtube-dl-8f053519846d8758de4e3ad67960e4161407d334.tar.gz youtube-dl-8f053519846d8758de4e3ad67960e4161407d334.zip |
[anitube] Minor fixes (#1776)
-rw-r--r-- | youtube_dl/extractor/anitube.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/youtube_dl/extractor/anitube.py b/youtube_dl/extractor/anitube.py index 2954966a6..679027f4e 100644 --- a/youtube_dl/extractor/anitube.py +++ b/youtube_dl/extractor/anitube.py @@ -6,11 +6,12 @@ from .common import InfoExtractor class AnitubeIE(InfoExtractor): IE_NAME = u'anitube.se' - _VALID_URL = r'http?://(?:www\.)?anitube\.se/video/(?P<id>\d+)' + _VALID_URL = r'https?://(?:www\.)?anitube\.se/video/(?P<id>\d+)' _TEST = { u'url': u'http://www.anitube.se/video/36621', - u'md5': u'0c4e4f1051bf50f5982f829f7230f539', + u'md5': u'59d0eeae28ea0bc8c05e7af429998d43', + u'file': u'36621.mp4', u'info_dict': { u'id': u'36621', u'ext': u'mp4', @@ -23,27 +24,22 @@ class AnitubeIE(InfoExtractor): video_id = mobj.group('id') webpage = self._download_webpage(url, video_id) - key = self._html_search_regex(r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)', webpage, u'key') webpage_config = self._download_webpage('http://www.anitube.se/nuevo/econfig.php?key=%s' % key, key) - config_xml = xml.etree.ElementTree.fromstring(webpage_config.encode('utf-8')) video_title = config_xml.find('title').text - formats = [] - video_url = config_xml.find('file') if video_url is not None: formats.append({ 'format_id': 'sd', 'url': video_url.text, }) - video_url = config_xml.find('filehd') if video_url is not None: formats.append({ @@ -54,6 +50,5 @@ class AnitubeIE(InfoExtractor): return { 'id': video_id, 'title': video_title, - 'ext': 'mp4', 'formats': formats } |