Browse Source

[videolecturesnet] Check http format URLs (Closes #4968)

totalwebcasting
Sergey M? 10 years ago
committed by Sergey M․
parent
commit
0d93378887
1 changed files with 24 additions and 9 deletions
  1. +24
    -9
      youtube_dl/extractor/videolecturesnet.py

+ 24
- 9
youtube_dl/extractor/videolecturesnet.py View File

@ -49,15 +49,30 @@ class VideoLecturesNetIE(InfoExtractor):
thumbnail = ( thumbnail = (
None if thumbnail_el is None else thumbnail_el.attrib.get('src')) None if thumbnail_el is None else thumbnail_el.attrib.get('src'))
formats = [{
'url': v.attrib['src'],
'width': int_or_none(v.attrib.get('width')),
'height': int_or_none(v.attrib.get('height')),
'filesize': int_or_none(v.attrib.get('size')),
'tbr': int_or_none(v.attrib.get('systemBitrate')) / 1000.0,
'ext': v.attrib.get('ext'),
} for v in switch.findall('./video')
if v.attrib.get('proto') == 'http']
formats = []
for v in switch.findall('./video'):
proto = v.attrib.get('proto')
if not proto in ['http', 'rtmp']:
continue
f = {
'width': int_or_none(v.attrib.get('width')),
'height': int_or_none(v.attrib.get('height')),
'filesize': int_or_none(v.attrib.get('size')),
'tbr': int_or_none(v.attrib.get('systemBitrate')) / 1000.0,
'ext': v.attrib.get('ext'),
}
src = v.attrib['src']
if proto == 'http':
if self._is_valid_url(src, video_id):
f['url'] = src
formats.append(f)
elif proto == 'rtmp':
f.update({
'url': v.attrib['streamer'],
'play_path': src,
})
formats.append(f)
self._sort_formats(formats)
return { return {
'id': video_id, 'id': video_id,


Loading…
Cancel
Save