projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
03e3b4e
)
[bild] Make more robust and improve hls extraction
author
Sergey M․
<dstftw@gmail.com>
Sun, 11 Oct 2015 13:28:00 +0000
(19:28 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 11 Oct 2015 13:28:00 +0000
(19:28 +0600)
youtube_dl/extractor/expotv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/expotv.py
b/youtube_dl/extractor/expotv.py
index 23a38c7c1673c2929e56a03390a772547ea387e0..1585a03bb9235a520c63e84c306294f6958dfe13 100644
(file)
--- a/
youtube_dl/extractor/expotv.py
+++ b/
youtube_dl/extractor/expotv.py
@@
-34,22
+34,25
@@
class ExpoTVIE(InfoExtractor):
player_key = self._search_regex(
r'<param name="playerKey" value="([^"]+)"', webpage, 'player key')
config = self._download_json(
player_key = self._search_regex(
r'<param name="playerKey" value="([^"]+)"', webpage, 'player key')
config = self._download_json(
- 'http://client.expotv.com/video/config/%s/%s' % (video_id, player_key),
- video_id,
- note='Downloading video configuration')
+ 'http://client.expotv.com/video/config/%s/%s' % (video_id, player_key),
+ video_id, 'Downloading video configuration')
formats = []
for fcfg in config['sources']:
formats = []
for fcfg in config['sources']:
- if fcfg['type'] == 'm3u8':
- formats.extend(self._extract_m3u8_formats(fcfg['file'], video_id))
+ media_url = fcfg.get('file')
+ if not media_url:
+ continue
+ if fcfg.get('type') == 'm3u8':
+ formats.extend(self._extract_m3u8_formats(
+ media_url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls'))
else:
formats.append({
else:
formats.append({
- 'url':
fcfg['file']
,
+ 'url':
media_url
,
'height': int_or_none(fcfg.get('height')),
'format_id': fcfg.get('label'),
'ext': self._search_regex(
'height': int_or_none(fcfg.get('height')),
'format_id': fcfg.get('label'),
'ext': self._search_regex(
- r'filename=.*\.([a-z0-9_A-Z]+)&',
fcfg['file']
,
- 'file extension', default=None),
+ r'filename=.*\.([a-z0-9_A-Z]+)&',
media_url
,
+ 'file extension', default=None)
or fcfg.get('type')
,
})
self._sort_formats(formats)
})
self._sort_formats(formats)