R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[nrk:base] Redo playback extractor

Browse Source 
It does not need to be in the loop, introduces some duplicated parts of code
This commit is contained in:
Roxedus 2020-06-24 14:28:34 +02:00
parent 64ea58e49c
commit 10664e43be
No known key found for this signature in database
GPG Key ID: 9B4E311961C63639
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
youtube_dl/extractor/nrk.py
View File

@ -40,6 +40,10 @@ class NRKBaseIE(InfoExtractor):
self._api_host = api_host self._api_host = api_host
break break
playback_manifest = self._download_json(
'http://%s/playback/manifest/program/%s' % (self._api_host, video_id),
video_id, 'Downloading manifest JSON', fatal=False)
title = data.get('fullTitle') or data.get('mainTitle') or data['title'] title = data.get('fullTitle') or data.get('mainTitle') or data['title']
alt_title = data.get('mainTitle') alt_title = data.get('mainTitle')
video_id = data.get('id') or video_id video_id = data.get('id') or video_id
@ -53,6 +57,28 @@ class NRKBaseIE(InfoExtractor):
def make_title(t): def make_title(t):
return self._live_title(t) if live else t return self._live_title(t) if live else t
playback_convia = playback_manifest.get('statistics').get('conviva')
if playback_convia:
streamurl = playback_convia.get('streamUrl', None)
stream = self._extract_m3u8_formats(streamurl, video_id, 'mp4',
'm3u8_native', m3u8_id='hls', fatal=False)
custom = playback_convia.get('custom')
dur = parse_duration(playback_convia.get('duration'))
subs = {}
for sub_title in playback_manifest.get('playable').get('subtitles'):
subs.setdefault('no', []).append({
'url': sub_title.get('webVtt')
})
self._sort_formats(stream)
entries.append({
'id': custom.get('contentId'),
'title': custom.get('title'),
'duration': dur,
'subtitles': subs,
'formats': stream,
})
media_assets = data.get('mediaAssets') media_assets = data.get('mediaAssets')
if media_assets and isinstance(media_assets, list): if media_assets and isinstance(media_assets, list):
def video_id_and_title(idx): def video_id_and_title(idx):
@ -63,14 +89,6 @@ class NRKBaseIE(InfoExtractor):
if not asset_url: if not asset_url:
continue continue
formats = self._extract_akamai_formats(asset_url, video_id) formats = self._extract_akamai_formats(asset_url, video_id)
playback_manifest = self._download_json(
'http://%s/playback/manifest/program/%s' % (self._api_host, video_id),
video_id, 'Downloading manifest JSON', fatal=False)
streamurl = playback_manifest.get('statistics').get('conviva').get('streamUrl')
formats.extend(self._extract_m3u8_formats(
streamurl, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False,
errnote='Alternate extractor failed'))
if not formats: if not formats:
continue continue
self._sort_formats(formats) self._sort_formats(formats)