MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-23 18:06:50 +01:00
Code Issues Releases Wiki Activity

[abc:iview] Improve extraction and bypass geo restriction (closes #14782)

Browse Source
This commit is contained in:
Sergey M․ 2017-12-31 01:22:15 +07:00
parent 2e65e7db9e
commit 77341dae14
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
youtube_dl/extractor/abc.py
View File

@ -13,6 +13,7 @@ from ..utils import (
int_or_none, int_or_none,
parse_iso8601, parse_iso8601,
try_get, try_get,
update_url_query,
) )
@ -104,21 +105,24 @@ class ABCIE(InfoExtractor):
class ABCIViewIE(InfoExtractor): class ABCIViewIE(InfoExtractor):
IE_NAME = 'abc.net.au:iview' IE_NAME = 'abc.net.au:iview'
_VALID_URL = r'https?://iview\.abc\.net\.au/programs/[^/]+/(?P<id>[^/?#]+)' _VALID_URL = r'https?://iview\.abc\.net\.au/programs/[^/]+/(?P<id>[^/?#]+)'
_GEO_COUNTRIES = ['AU']
# ABC iview programs are normally available for 14 days only. # ABC iview programs are normally available for 14 days only.
_TESTS = [{ _TESTS = [{
'url': 'http://iview.abc.net.au/programs/diaries-of-a-broken-mind/ZX9735A001S00', 'url': 'http://iview.abc.net.au/programs/call-the-midwife/ZW0898A003S00',
'md5': 'cde42d728b3b7c2b32b1b94b4a548afc', 'md5': 'cde42d728b3b7c2b32b1b94b4a548afc',
'info_dict': { 'info_dict': {
'id': 'ZX9735A001S00', 'id': 'ZW0898A003S00',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Diaries Of A Broken Mind', 'title': 'Series 5 Ep 3',
'description': 'md5:7de3903874b7a1be279fe6b68718fc9e', 'description': 'md5:e0ef7d4f92055b86c4f33611f180ed79',
'upload_date': '20161010', 'upload_date': '20171228',
'uploader_id': 'abc2', 'uploader_id': 'abc1',
'timestamp': 1476064920, 'timestamp': 1514499187,
},
'params': {
'skip_download': True,
}, },
'skip': 'Video gone',
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -129,35 +133,30 @@ class ABCIViewIE(InfoExtractor):
title = video_params.get('title') or video_params['seriesTitle'] title = video_params.get('title') or video_params['seriesTitle']
stream = next(s for s in video_params['playlist'] if s.get('type') == 'program') stream = next(s for s in video_params['playlist'] if s.get('type') == 'program')
key = 'android.content.res.Resources'.encode('utf-8')
time_str = str(int(time.time()))
house_number = video_params.get('episodeHouseNumber') house_number = video_params.get('episodeHouseNumber')
path = '/auth/hls/sign?ts={0}&hn={1}&d=android-mobile'.format( path = '/auth/hls/sign?ts={0}&hn={1}&d=android-mobile'.format(
time_str, house_number) int(time.time()), house_number)
sig = hmac.new(key, path.encode('utf-8'), hashlib.sha256).hexdigest() sig = hmac.new(
auth_url = 'http://iview.abc.net.au{0}&sig={1}'.format(path, sig) 'android.content.res.Resources'.encode('utf-8'),
token = self._download_webpage(auth_url, video_id) path.encode('utf-8'), hashlib.sha256).hexdigest()
token = self._download_webpage(
format_urls = [] 'http://iview.abc.net.au{0}&sig={1}'.format(path, sig), video_id)
def tokenize_url(url, token): def tokenize_url(url, token):
return ''.join([url, '?hdnea=', token]) return update_url_query(url, {
'hdnea': token,
})
# May have higher quality video for sd in ('sd', 'sd-low'):
sd_url = try_get( sd_url = try_get(
stream, lambda x: x['streams']['hls']['sd'], compat_str) stream, lambda x: x['streams']['hls'][sd], compat_str)
if sd_url: if not sd_url:
format_urls.append(tokenize_url(sd_url, token)) continue
else: formats = self._extract_m3u8_formats(
sd_low_url = try_get( tokenize_url(sd_url, token), video_id, 'mp4',
stream, lambda x: x['streams']['hls']['sd-low'], compat_str) entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
format_urls.append(tokenize_url(sd_low_url, token)) if formats:
break
formats = []
for format_url in format_urls:
if format_url:
formats.extend(
self._extract_m3u8_formats(format_url, video_id, 'mp4'))
self._sort_formats(formats) self._sort_formats(formats)
subtitles = {} subtitles = {}