projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FFmpegMergerPP: use the new system for specifying which files can be delete
[youtube-dl]
/
youtube_dl
/
extractor
/
theplatform.py
diff --git
a/youtube_dl/extractor/theplatform.py
b/youtube_dl/extractor/theplatform.py
index 50c51d825301d6c324db13e0d30e20ef5f456243..6a006b2d201365eab62c5b090633a1c5e345a48f 100644
(file)
--- a/
youtube_dl/extractor/theplatform.py
+++ b/
youtube_dl/extractor/theplatform.py
@@
-17,6
+17,7
@@
from ..utils import (
ExtractorError,
xpath_with_ns,
unsmuggle_url,
ExtractorError,
xpath_with_ns,
unsmuggle_url,
+ int_or_none,
)
_x = lambda p: xpath_with_ns(p, {'smil': 'http://www.w3.org/2005/SMIL21/Language'})
)
_x = lambda p: xpath_with_ns(p, {'smil': 'http://www.w3.org/2005/SMIL21/Language'})
@@
-148,9
+149,9
@@
class ThePlatformIE(InfoExtractor):
base_url = head.find(_x('smil:meta')).attrib['base']
for f in switch.findall(_x('smil:video')):
attr = f.attrib
base_url = head.find(_x('smil:meta')).attrib['base']
for f in switch.findall(_x('smil:video')):
attr = f.attrib
- width = int
(attr['width']
)
- height = int
(attr['height']
)
- vbr = int
(attr['system-bitrate']) // 1000
+ width = int
_or_none(attr.get('width')
)
+ height = int
_or_none(attr.get('height')
)
+ vbr = int
_or_none(attr.get('system-bitrate'), 1000)
format_id = '%dx%d_%dk' % (width, height, vbr)
formats.append({
'format_id': format_id,
format_id = '%dx%d_%dk' % (width, height, vbr)
formats.append({
'format_id': format_id,
@@
-165,7
+166,7
@@
class ThePlatformIE(InfoExtractor):
switch = body.find(_x('smil:seq//smil:switch')) or body.find(_x('smil:seq/smil:switch'))
for f in switch.findall(_x('smil:video')):
attr = f.attrib
switch = body.find(_x('smil:seq//smil:switch')) or body.find(_x('smil:seq/smil:switch'))
for f in switch.findall(_x('smil:video')):
attr = f.attrib
- vbr = int
(attr['system-bitrate']) // 1000
+ vbr = int
_or_none(attr.get('system-bitrate'), 1000)
ext = determine_ext(attr['src'])
if ext == 'once':
ext = 'mp4'
ext = determine_ext(attr['src'])
if ext == 'once':
ext = 'mp4'
@@
-184,5
+185,5
@@
class ThePlatformIE(InfoExtractor):
'formats': formats,
'description': info['description'],
'thumbnail': info['defaultThumbnailUrl'],
'formats': formats,
'description': info['description'],
'thumbnail': info['defaultThumbnailUrl'],
- 'duration': in
fo['duration'] // 1000
,
+ 'duration': in
t_or_none(info.get('duration'), 1000)
,
}
}