projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[gamekings] Stricter checks
[youtube-dl]
/
youtube_dl
/
extractor
/
twentyfourvideo.py
diff --git
a/youtube_dl/extractor/twentyfourvideo.py
b/youtube_dl/extractor/twentyfourvideo.py
index cb9e5f1b5ccfbf64d90c6bee96d26c548c4379d7..e03e2dbaa42f23a5107a50c67e7c12d9f378600b 100644
(file)
--- a/
youtube_dl/extractor/twentyfourvideo.py
+++ b/
youtube_dl/extractor/twentyfourvideo.py
@@
-5,6
+5,8
@@
from .common import InfoExtractor
from ..utils import (
parse_iso8601,
int_or_none,
from ..utils import (
parse_iso8601,
int_or_none,
+ xpath_attr,
+ xpath_element,
)
)
@@
-15,7
+17,7
@@
class TwentyFourVideoIE(InfoExtractor):
_TESTS = [
{
'url': 'http://www.24video.net/video/view/1044982',
_TESTS = [
{
'url': 'http://www.24video.net/video/view/1044982',
- 'md5': '
d041af8b5b4246ea466226a0d6693345
',
+ 'md5': '
e09fc0901d9eaeedac872f154931deeb
',
'info_dict': {
'id': '1044982',
'ext': 'mp4',
'info_dict': {
'id': '1044982',
'ext': 'mp4',
@@
-69,12
+71,14
@@
class TwentyFourVideoIE(InfoExtractor):
r'http://www.24video.net/video/xml/%s?mode=init' % video_id,
video_id, 'Downloading init XML')
r'http://www.24video.net/video/xml/%s?mode=init' % video_id,
video_id, 'Downloading init XML')
- video = self._download_xml(
+ video
_xml
= self._download_xml(
'http://www.24video.net/video/xml/%s?mode=play' % video_id,
'http://www.24video.net/video/xml/%s?mode=play' % video_id,
- video_id, 'Downloading video XML').find('.//video')
+ video_id, 'Downloading video XML')
+
+ video = xpath_element(video_xml, './/video', 'video', fatal=True)
formats = [{
formats = [{
- 'url':
video.attrib['url']
,
+ 'url':
xpath_attr(video, '', 'url', 'video URL', fatal=True)
,
}]
like_count = int_or_none(video.get('ratingPlus'))
}]
like_count = int_or_none(video.get('ratingPlus'))