[extractor/common] Move jwplayer formats extraction in separate method
This commit is contained in:
parent
a50862b735
commit
ed0cf9b383
1 changed files with 56 additions and 50 deletions
|
@ -2198,8 +2198,41 @@ class InfoExtractor(object):
|
||||||
|
|
||||||
this_video_id = video_id or video_data['mediaid']
|
this_video_id = video_id or video_data['mediaid']
|
||||||
|
|
||||||
|
formats = self._parse_jwplayer_formats(video_data['sources'], this_video_id)
|
||||||
|
self._sort_formats(formats)
|
||||||
|
|
||||||
|
subtitles = {}
|
||||||
|
tracks = video_data.get('tracks')
|
||||||
|
if tracks and isinstance(tracks, list):
|
||||||
|
for track in tracks:
|
||||||
|
if track.get('kind') != 'captions':
|
||||||
|
continue
|
||||||
|
track_url = urljoin(base_url, track.get('file'))
|
||||||
|
if not track_url:
|
||||||
|
continue
|
||||||
|
subtitles.setdefault(track.get('label') or 'en', []).append({
|
||||||
|
'url': self._proto_relative_url(track_url)
|
||||||
|
})
|
||||||
|
|
||||||
|
entries.append({
|
||||||
|
'id': this_video_id,
|
||||||
|
'title': video_data['title'] if require_title else video_data.get('title'),
|
||||||
|
'description': video_data.get('description'),
|
||||||
|
'thumbnail': self._proto_relative_url(video_data.get('image')),
|
||||||
|
'timestamp': int_or_none(video_data.get('pubdate')),
|
||||||
|
'duration': float_or_none(jwplayer_data.get('duration') or video_data.get('duration')),
|
||||||
|
'subtitles': subtitles,
|
||||||
|
'formats': formats,
|
||||||
|
})
|
||||||
|
if len(entries) == 1:
|
||||||
|
return entries[0]
|
||||||
|
else:
|
||||||
|
return self.playlist_result(entries)
|
||||||
|
|
||||||
|
def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
|
||||||
|
m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
|
||||||
formats = []
|
formats = []
|
||||||
for source in video_data['sources']:
|
for source in jwplayer_sources_data :
|
||||||
source_url = self._proto_relative_url(source['file'])
|
source_url = self._proto_relative_url(source['file'])
|
||||||
if base_url:
|
if base_url:
|
||||||
source_url = compat_urlparse.urljoin(base_url, source_url)
|
source_url = compat_urlparse.urljoin(base_url, source_url)
|
||||||
|
@ -2207,10 +2240,10 @@ class InfoExtractor(object):
|
||||||
ext = mimetype2ext(source_type) or determine_ext(source_url)
|
ext = mimetype2ext(source_type) or determine_ext(source_url)
|
||||||
if source_type == 'hls' or ext == 'm3u8':
|
if source_type == 'hls' or ext == 'm3u8':
|
||||||
formats.extend(self._extract_m3u8_formats(
|
formats.extend(self._extract_m3u8_formats(
|
||||||
source_url, this_video_id, 'mp4', 'm3u8_native', m3u8_id=m3u8_id, fatal=False))
|
source_url, video_id, 'mp4', 'm3u8_native', m3u8_id=m3u8_id, fatal=False))
|
||||||
elif ext == 'mpd':
|
elif ext == 'mpd':
|
||||||
formats.extend(self._extract_mpd_formats(
|
formats.extend(self._extract_mpd_formats(
|
||||||
source_url, this_video_id, mpd_id=mpd_id, fatal=False))
|
source_url, video_id, mpd_id=mpd_id, fatal=False))
|
||||||
# https://github.com/jwplayer/jwplayer/blob/master/src/js/providers/default.js#L67
|
# https://github.com/jwplayer/jwplayer/blob/master/src/js/providers/default.js#L67
|
||||||
elif source_type.startswith('audio') or ext in ('oga', 'aac', 'mp3', 'mpeg', 'vorbis'):
|
elif source_type.startswith('audio') or ext in ('oga', 'aac', 'mp3', 'mpeg', 'vorbis'):
|
||||||
formats.append({
|
formats.append({
|
||||||
|
@ -2248,35 +2281,8 @@ class InfoExtractor(object):
|
||||||
if rtmp_params:
|
if rtmp_params:
|
||||||
a_format.update(rtmp_params)
|
a_format.update(rtmp_params)
|
||||||
formats.append(a_format)
|
formats.append(a_format)
|
||||||
self._sort_formats(formats)
|
return formats
|
||||||
|
|
||||||
subtitles = {}
|
|
||||||
tracks = video_data.get('tracks')
|
|
||||||
if tracks and isinstance(tracks, list):
|
|
||||||
for track in tracks:
|
|
||||||
if track.get('kind') != 'captions':
|
|
||||||
continue
|
|
||||||
track_url = urljoin(base_url, track.get('file'))
|
|
||||||
if not track_url:
|
|
||||||
continue
|
|
||||||
subtitles.setdefault(track.get('label') or 'en', []).append({
|
|
||||||
'url': self._proto_relative_url(track_url)
|
|
||||||
})
|
|
||||||
|
|
||||||
entries.append({
|
|
||||||
'id': this_video_id,
|
|
||||||
'title': video_data['title'] if require_title else video_data.get('title'),
|
|
||||||
'description': video_data.get('description'),
|
|
||||||
'thumbnail': self._proto_relative_url(video_data.get('image')),
|
|
||||||
'timestamp': int_or_none(video_data.get('pubdate')),
|
|
||||||
'duration': float_or_none(jwplayer_data.get('duration') or video_data.get('duration')),
|
|
||||||
'subtitles': subtitles,
|
|
||||||
'formats': formats,
|
|
||||||
})
|
|
||||||
if len(entries) == 1:
|
|
||||||
return entries[0]
|
|
||||||
else:
|
|
||||||
return self.playlist_result(entries)
|
|
||||||
|
|
||||||
def _live_title(self, name):
|
def _live_title(self, name):
|
||||||
""" Generate the title for a live video """
|
""" Generate the title for a live video """
|
||||||
|
|
Loading…
Reference in a new issue