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

Fix break when request fails

Browse Source
This commit is contained in:
Roxedus 2020-07-01 15:22:01 +02:00
parent 10664e43be
commit da499b84da
No known key found for this signature in database
GPG Key ID: 9B4E311961C63639
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/nrk.py
View File

@ -57,11 +57,12 @@ 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') playback_convia = (playback_manifest.get('statistics', {}).get('conviva')
if playback_convia: if playback_manifest else None)
if isinstance(playback_convia, dict):
streamurl = playback_convia.get('streamUrl', None) streamurl = playback_convia.get('streamUrl', None)
stream = self._extract_m3u8_formats(streamurl, video_id, 'mp4', stream = self._extract_m3u8_formats(streamurl, video_id, 'mp4',
'm3u8_native', m3u8_id='hls', fatal=False) 'm3u8_native', m3u8_id='hls', fatal=False)
custom = playback_convia.get('custom') custom = playback_convia.get('custom')
dur = parse_duration(playback_convia.get('duration')) dur = parse_duration(playback_convia.get('duration'))
@ -170,8 +171,8 @@ class NRKBaseIE(InfoExtractor):
programs = self._download_json( programs = self._download_json(
'http://%s/programs/%s' % (self._api_host, video_id), 'http://%s/programs/%s' % (self._api_host, video_id),
video_id, 'Downloading programs manifest JSON', fatal=False) video_id, 'Downloading programs manifest JSON', fatal=False)
season_number = int_or_none(programs.get('seasonNumber')) season_number = int_or_none(programs.get('seasonNumber')) if programs else None
episode_number = int_or_none(programs.get('episodeNumber')) episode_number = int_or_none(programs.get('episodeNumber')) if programs else None
thumbnails = None thumbnails = None
images = data.get('images') images = data.get('images')