From 3ca5c363ff290fe686206702216eb1bcac28d7ac Mon Sep 17 00:00:00 2001 From: d2au Date: Sun, 25 Jun 2017 14:01:43 +0930 Subject: [PATCH 1/2] [abc.net.au:iview] Support hq streams when available --- youtube_dl/extractor/abc.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index 0247cabf9..a0551e4b4 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -124,7 +124,12 @@ class ABCIViewIE(InfoExtractor): title = video_params.get('title') or video_params['seriesTitle'] stream = next(s for s in video_params['playlist'] if s.get('type') == 'program') - formats = self._extract_akamai_formats(stream['hds-unmetered'], video_id) + if 'sd' in stream["stream-labels"]: + hds = stream['streams']['hds']['sd'].replace('metered', 'um') + else: + hds = stream['hds-unmetered'] + + formats = self._extract_akamai_formats(hds, video_id) self._sort_formats(formats) subtitles = {} From 53c10a77bbe45b0dbefa06e9a1850e79319aa820 Mon Sep 17 00:00:00 2001 From: d2au Date: Wed, 28 Jun 2017 12:09:38 +0930 Subject: [PATCH 2/2] [abc.net.au:iview] Requested fixes --- youtube_dl/extractor/abc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index a0551e4b4..41ad4e243 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -124,10 +124,10 @@ class ABCIViewIE(InfoExtractor): title = video_params.get('title') or video_params['seriesTitle'] stream = next(s for s in video_params['playlist'] if s.get('type') == 'program') - if 'sd' in stream["stream-labels"]: - hds = stream['streams']['hds']['sd'].replace('metered', 'um') + if 'sd' in stream.get("stream-labels", {}): + hds = stream.get('streams', {}).get('hds', {}).get('sd', '').replace('metered', 'um') else: - hds = stream['hds-unmetered'] + hds = stream.get('hds-unmetered') formats = self._extract_akamai_formats(hds, video_id) self._sort_formats(formats)