From 1bd64740225db265681c14c0aaf888fea328b642 Mon Sep 17 00:00:00 2001 From: d2au Date: Sat, 18 Nov 2017 05:28:58 +1030 Subject: [PATCH] [abc.net.au:iview] use metered hls urls #14711 ABC dropped unmetering, so change to metered hls urls which require auth. --- youtube_dl/extractor/abc.py | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py index 60f753b95..62748ea5c 100644 --- a/youtube_dl/extractor/abc.py +++ b/youtube_dl/extractor/abc.py @@ -1,6 +1,9 @@ from __future__ import unicode_literals +import hashlib +import hmac import re +import time from .common import InfoExtractor from ..compat import compat_str @@ -126,14 +129,29 @@ 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') - format_urls = [ - try_get(stream, lambda x: x['hds-unmetered'], compat_str)] + key = 'android.content.res.Resources'.encode('utf-8') + time_str = str(int(time.time())) + house_number = video_params.get('episodeHouseNumber') + path = '/auth/hls/sign?ts={0}&hn={1}&d=android-mobile'.format( + time_str, house_number).encode('utf-8') + sig = hmac.new(key, path, hashlib.sha256).hexdigest() + auth_url = 'http://iview.abc.net.au{0}&sig={1}'.format(path, sig) + token = self._download_webpage(auth_url, video_id) + + format_urls = [] + + def tokenize_url(url, token): + return ''.join([url, '?hdnea=', token]) # May have higher quality video sd_url = try_get( - stream, lambda x: x['streams']['hds']['sd'], compat_str) + stream, lambda x: x['streams']['hls']['sd'], compat_str) if sd_url: - format_urls.append(sd_url.replace('metered', 'um')) + format_urls.append(tokenize_url(sd_url, token)) + else: + sd_low_url = try_get( + stream, lambda x: x['streams']['hls']['sd-low'], compat_str) + format_urls.append(tokenize_url(sd_low_url, token)) formats = [] for format_url in format_urls: