projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[firstpost] Add extractor (Fixes #2324)
[youtube-dl]
/
youtube_dl
/
extractor
/
anitube.py
diff --git
a/youtube_dl/extractor/anitube.py
b/youtube_dl/extractor/anitube.py
index 2954966a6e6d8d8517e90aa5efa464d85dcfef81..2b019daa997ab3bb5dd15cdf5c2df489e181d177 100644
(file)
--- a/
youtube_dl/extractor/anitube.py
+++ b/
youtube_dl/extractor/anitube.py
@@
-1,21
+1,22
@@
import re
import re
-import xml.etree.ElementTree
from .common import InfoExtractor
class AnitubeIE(InfoExtractor):
IE_NAME = u'anitube.se'
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'http
s
?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
_TEST = {
u'url': u'http://www.anitube.se/video/36621',
_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',
u'title': u'Recorder to Randoseru 01',
},
u'info_dict': {
u'id': u'36621',
u'ext': u'mp4',
u'title': u'Recorder to Randoseru 01',
},
+ u'skip': u'Blocked in the US',
}
def _real_extract(self, url):
}
def _real_extract(self, url):
@@
-23,27
+24,21
@@
class AnitubeIE(InfoExtractor):
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
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')
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,
+
config_xml = self._download_xml
('http://www.anitube.se/nuevo/econfig.php?key=%s' % key,
key)
key)
- 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')
if video_url is not None:
formats.append({
'format_id': 'sd',
'url': video_url.text,
})
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({
video_url = config_xml.find('filehd')
if video_url is not None:
formats.append({
@@
-54,6
+49,5
@@
class AnitubeIE(InfoExtractor):
return {
'id': video_id,
'title': video_title,
return {
'id': video_id,
'title': video_title,
- 'ext': 'mp4',
'formats': formats
}
'formats': formats
}