|
|
|
@ -33,20 +33,24 @@ class ExpoTVIE(InfoExtractor):
|
|
|
|
|
webpage = self._download_webpage(url, video_id)
|
|
|
|
|
player_key = self._search_regex(
|
|
|
|
|
r'<param name="playerKey" value="([^"]+)"', webpage, 'player key')
|
|
|
|
|
config_url = 'http://client.expotv.com/video/config/%s/%s' % (
|
|
|
|
|
video_id, player_key)
|
|
|
|
|
config = self._download_json(
|
|
|
|
|
config_url, video_id,
|
|
|
|
|
note='Downloading video configuration')
|
|
|
|
|
'http://client.expotv.com/video/config/%s/%s' % (video_id, player_key),
|
|
|
|
|
video_id,
|
|
|
|
|
note='Downloading video configuration')
|
|
|
|
|
|
|
|
|
|
formats = [{
|
|
|
|
|
'url': fcfg['file'],
|
|
|
|
|
'height': int_or_none(fcfg.get('height')),
|
|
|
|
|
'format_note': fcfg.get('label'),
|
|
|
|
|
'ext': self._search_regex(
|
|
|
|
|
r'filename=.*\.([a-z0-9_A-Z]+)&', fcfg['file'],
|
|
|
|
|
'file extension', default=None),
|
|
|
|
|
} 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))
|
|
|
|
|
else:
|
|
|
|
|
formats.append({
|
|
|
|
|
'url': fcfg['file'],
|
|
|
|
|
'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),
|
|
|
|
|
})
|
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
|
|
|
|
title = self._og_search_title(webpage)
|
|
|
|
|