projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[orf] Remove unused variable name
[youtube-dl]
/
youtube_dl
/
extractor
/
theplatform.py
diff --git
a/youtube_dl/extractor/theplatform.py
b/youtube_dl/extractor/theplatform.py
index 650d7517f83ee09d4467d4338cbd7c97620121a5..23172143ec41ecc48e88c333dfdd476db330e1b8 100644
(file)
--- a/
youtube_dl/extractor/theplatform.py
+++ b/
youtube_dl/extractor/theplatform.py
@@
-38,7
+38,7
@@
class ThePlatformIE(InfoExtractor):
error_msg = next(
n.attrib['abstract']
for n in meta.findall(_x('.//smil:ref'))
error_msg = next(
n.attrib['abstract']
for n in meta.findall(_x('.//smil:ref'))
- if n.attrib
['title']
== u'Geographic Restriction')
+ if n.attrib
.get('title')
== u'Geographic Restriction')
except StopIteration:
pass
else:
except StopIteration:
pass
else:
@@
-55,15
+55,21
@@
class ThePlatformIE(InfoExtractor):
formats = []
for f in switch.findall(_x('smil:video')):
attr = f.attrib
formats = []
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
+ format_id = '%dx%d_%dk' % (width, height, vbr)
formats.append({
formats.append({
+ 'format_id': format_id,
'url': base_url,
'play_path': 'mp4:' + attr['src'],
'ext': 'flv',
'url': base_url,
'play_path': 'mp4:' + attr['src'],
'ext': 'flv',
- 'width':
int(attr['width'])
,
- 'height':
int(attr['height'])
,
- 'vbr':
int(attr['system-bitrate'])
,
+ 'width':
width
,
+ 'height':
height
,
+ 'vbr':
vbr
,
})
})
- formats.sort(key=lambda f: (f['height'], f['width'], f['vbr']))
+
+ self._sort_formats(formats)
return {
'id': video_id,
return {
'id': video_id,