Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[anitube] Minor fixes (#1776)

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-11-20 06:35:02 +01:00
parent 4eb92208a3
commit 8f05351984
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/anitube.py
View File

@ -6,11 +6,12 @@ from .common import InfoExtractor
class AnitubeIE(InfoExtractor): class AnitubeIE(InfoExtractor):
IE_NAME = u'anitube.se' 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 = { _TEST = {
u'url': u'http://www.anitube.se/video/36621', 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'info_dict': {
u'id': u'36621', u'id': u'36621',
u'ext': u'mp4', u'ext': u'mp4',
@ -23,27 +24,22 @@ class AnitubeIE(InfoExtractor):
video_id = mobj.group('id') video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
key = self._html_search_regex(r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)', key = self._html_search_regex(r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)',
webpage, u'key') webpage, u'key')
webpage_config = self._download_webpage('http://www.anitube.se/nuevo/econfig.php?key=%s' % key, webpage_config = self._download_webpage('http://www.anitube.se/nuevo/econfig.php?key=%s' % key,
key) key)
config_xml = xml.etree.ElementTree.fromstring(webpage_config.encode('utf-8')) config_xml = xml.etree.ElementTree.fromstring(webpage_config.encode('utf-8'))
video_title = config_xml.find('title').text video_title = config_xml.find('title').text
formats = [] formats = []
video_url = config_xml.find('file') video_url = config_xml.find('file')
if video_url is not None: if video_url is not None:
formats.append({ formats.append({
'format_id': 'sd', 'format_id': 'sd',
'url': video_url.text, 'url': video_url.text,
}) })
video_url = config_xml.find('filehd') video_url = config_xml.find('filehd')
if video_url is not None: if video_url is not None:
formats.append({ formats.append({
@ -54,6 +50,5 @@ class AnitubeIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'title': video_title, 'title': video_title,
'ext': 'mp4',
'formats': formats 'formats': formats
} }