Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[rts,srgssr] improve extraction for geo restricted videos(fixes #11089)(closes #4989)

Browse Source
This commit is contained in:
Remita Amine 2016-12-10 10:47:19 +01:00
parent 18ece70c4d
commit 68601ef3ac
2 changed files with 100 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
youtube_dl/extractor/rts.py
View File

@ -4,27 +4,24 @@ from __future__ import unicode_literals
import re import re
from .srgssr import SRGSSRIE from .srgssr import SRGSSRIE
from ..compat import ( from ..compat import compat_str
compat_str,
compat_urllib_parse_urlparse,
)
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
parse_duration, parse_duration,
parse_iso8601, parse_iso8601,
unescapeHTML, unescapeHTML,
xpath_text, determine_ext,
) )
class RTSIE(SRGSSRIE): class RTSIE(SRGSSRIE):
IE_DESC = 'RTS.ch' IE_DESC = 'RTS.ch'
_VALID_URL = r'rts:(?P<rts_id>\d+)|https?://(?:www\.)?rts\.ch/(?:[^/]+/){2,}(?P<id>[0-9]+)-(?P<display_id>.+?)\.html' _VALID_URL = r'rts:(?P<rts_id>\d+)|https?://(?:.+?\.)?rts\.ch/(?:[^/]+/){2,}(?P<id>[0-9]+)-(?P<display_id>.+?)\.html'
_TESTS = [ _TESTS = [
{ {
'url': 'http://www.rts.ch/archives/tv/divers/3449373-les-enfants-terribles.html', 'url': 'http://www.rts.ch/archives/tv/divers/3449373-les-enfants-terribles.html',
'md5': 'f254c4b26fb1d3c183793d52bc40d3e7', 'md5': 'ff7f8450a90cf58dacb64e29707b4a8e',
'info_dict': { 'info_dict': {
'id': '3449373', 'id': '3449373',
'display_id': 'les-enfants-terribles', 'display_id': 'les-enfants-terribles',
@ -38,35 +35,17 @@ class RTSIE(SRGSSRIE):
'thumbnail': 're:^https?://.*\.image', 'thumbnail': 're:^https?://.*\.image',
'view_count': int, 'view_count': int,
}, },
'params': {
# m3u8 download
'skip_download': True,
}
}, },
{ {
'url': 'http://www.rts.ch/emissions/passe-moi-les-jumelles/5624067-entre-ciel-et-mer.html', 'url': 'http://www.rts.ch/emissions/passe-moi-les-jumelles/5624067-entre-ciel-et-mer.html',
'md5': 'f1077ac5af686c76528dc8d7c5df29ba',
'info_dict': { 'info_dict': {
'id': '5742494', 'id': '5624065',
'display_id': '5742494', 'title': 'Passe-moi les jumelles',
'ext': 'mp4',
'duration': 3720,
'title': 'Les yeux dans les cieux - Mon homard au Canada',
'description': 'md5:d22ee46f5cc5bac0912e5a0c6d44a9f7',
'uploader': 'Passe-moi les jumelles',
'upload_date': '20140404',
'timestamp': 1396635300,
'thumbnail': 're:^https?://.*\.image',
'view_count': int,
}, },
'params': { 'playlist_mincount': 4,
# m3u8 download
'skip_download': True,
}
}, },
{ {
'url': 'http://www.rts.ch/video/sport/hockey/5745975-1-2-kloten-fribourg-5-2-second-but-pour-gotteron-par-kwiatowski.html', 'url': 'http://www.rts.ch/video/sport/hockey/5745975-1-2-kloten-fribourg-5-2-second-but-pour-gotteron-par-kwiatowski.html',
'md5': 'b4326fecd3eb64a458ba73c73e91299d',
'info_dict': { 'info_dict': {
'id': '5745975', 'id': '5745975',
'display_id': '1-2-kloten-fribourg-5-2-second-but-pour-gotteron-par-kwiatowski', 'display_id': '1-2-kloten-fribourg-5-2-second-but-pour-gotteron-par-kwiatowski',
@ -80,11 +59,15 @@ class RTSIE(SRGSSRIE):
'thumbnail': 're:^https?://.*\.image', 'thumbnail': 're:^https?://.*\.image',
'view_count': int, 'view_count': int,
}, },
'params': {
# m3u8 download
'skip_download': True,
},
'skip': 'Blocked outside Switzerland', 'skip': 'Blocked outside Switzerland',
}, },
{ {
'url': 'http://www.rts.ch/video/info/journal-continu/5745356-londres-cachee-par-un-epais-smog.html', 'url': 'http://www.rts.ch/video/info/journal-continu/5745356-londres-cachee-par-un-epais-smog.html',
'md5': '9f713382f15322181bb366cc8c3a4ff0', 'md5': '1bae984fe7b1f78e94abc74e802ed99f',
'info_dict': { 'info_dict': {
'id': '5745356', 'id': '5745356',
'display_id': 'londres-cachee-par-un-epais-smog', 'display_id': 'londres-cachee-par-un-epais-smog',
@ -92,16 +75,12 @@ class RTSIE(SRGSSRIE):
'duration': 33, 'duration': 33,
'title': 'Londres cachée par un épais smog', 'title': 'Londres cachée par un épais smog',
'description': 'Un important voile de smog recouvre Londres depuis mercredi, provoqué par la pollution et du sable du Sahara.', 'description': 'Un important voile de smog recouvre Londres depuis mercredi, provoqué par la pollution et du sable du Sahara.',
'uploader': 'Le Journal en continu', 'uploader': 'L\'actu en vidéo',
'upload_date': '20140403', 'upload_date': '20140403',
'timestamp': 1396537322, 'timestamp': 1396537322,
'thumbnail': 're:^https?://.*\.image', 'thumbnail': 're:^https?://.*\.image',
'view_count': int, 'view_count': int,
}, },
'params': {
# m3u8 download
'skip_download': True,
}
}, },
{ {
'url': 'http://www.rts.ch/audio/couleur3/programmes/la-belle-video-de-stephane-laurenceau/5706148-urban-hippie-de-damien-krisl-03-04-2014.html', 'url': 'http://www.rts.ch/audio/couleur3/programmes/la-belle-video-de-stephane-laurenceau/5706148-urban-hippie-de-damien-krisl-03-04-2014.html',
@ -125,6 +104,10 @@ class RTSIE(SRGSSRIE):
'title': 'Hockey: Davos décroche son 31e titre de champion de Suisse', 'title': 'Hockey: Davos décroche son 31e titre de champion de Suisse',
}, },
'playlist_mincount': 5, 'playlist_mincount': 5,
},
{
'url': 'http://pages.rts.ch/emissions/passe-moi-les-jumelles/5624065-entre-ciel-et-mer.html',
'only_matching': True,
} }
] ]
@ -142,19 +125,32 @@ class RTSIE(SRGSSRIE):
# media_id extracted out of URL is not always a real id # media_id extracted out of URL is not always a real id
if 'video' not in all_info and 'audio' not in all_info: if 'video' not in all_info and 'audio' not in all_info:
page = self._download_webpage(url, display_id) entries = []
# article with videos on rhs for item in all_info.get('items', []):
videos = re.findall( item_url = item.get('url')
r'<article[^>]+class="content-item"[^>]*>\s*<a[^>]+data-video-urn="urn:([^"]+)"', if not item_url:
page) continue
if not videos: entries.append(self.url_result(item_url, 'RTS'))
if not entries:
page, urlh = self._download_webpage_handle(url, display_id)
if re.match(self._VALID_URL, urlh.geturl()).group('id') != media_id:
return self.url_result(urlh.geturl(), 'RTS')
# article with videos on rhs
videos = re.findall( videos = re.findall(
r'(?s)<iframe[^>]+class="srg-player"[^>]+src="[^"]+urn:([^"]+)"', r'<article[^>]+class="content-item"[^>]*>\s*<a[^>]+data-video-urn="urn:([^"]+)"',
page) page)
if videos: if not videos:
entries = [self.url_result('srgssr:%s' % video_urn, 'SRGSSR') for video_urn in videos] videos = re.findall(
return self.playlist_result(entries, media_id, self._og_search_title(page)) r'(?s)<iframe[^>]+class="srg-player"[^>]+src="[^"]+urn:([^"]+)"',
page)
if videos:
entries = [self.url_result('srgssr:%s' % video_urn, 'SRGSSR') for video_urn in videos]
if entries:
return self.playlist_result(entries, media_id, all_info.get('title'))
internal_id = self._html_search_regex( internal_id = self._html_search_regex(
r'<(?:video|audio) data-id="([0-9]+)"', page, r'<(?:video|audio) data-id="([0-9]+)"', page,
@ -168,36 +164,29 @@ class RTSIE(SRGSSRIE):
info = all_info['video']['JSONinfo'] if 'video' in all_info else all_info['audio'] info = all_info['video']['JSONinfo'] if 'video' in all_info else all_info['audio']
upload_timestamp = parse_iso8601(info.get('broadcast_date')) title = info['title']
duration = info.get('duration') or info.get('cutout') or info.get('cutduration')
if isinstance(duration, compat_str):
duration = parse_duration(duration)
view_count = info.get('plays')
thumbnail = unescapeHTML(info.get('preview_image_url'))
def extract_bitrate(url): def extract_bitrate(url):
return int_or_none(self._search_regex( return int_or_none(self._search_regex(
r'-([0-9]+)k\.', url, 'bitrate', default=None)) r'-([0-9]+)k\.', url, 'bitrate', default=None))
formats = [] formats = []
for format_id, format_url in info['streams'].items(): streams = info.get('streams', {})
if format_id == 'hds_sd' and 'hds' in info['streams']: for format_id, format_url in streams.items():
if format_id == 'hds_sd' and 'hds' in streams:
continue continue
if format_id == 'hls_sd' and 'hls' in info['streams']: if format_id == 'hls_sd' and 'hls' in streams:
continue continue
if format_url.endswith('.f4m'): ext = determine_ext(format_url)
token = self._download_xml( if ext in ('m3u8', 'f4m'):
'http://tp.srgssr.ch/token/akahd.xml?stream=%s/*' % compat_urllib_parse_urlparse(format_url).path, format_url = self._get_tokenized_src(format_url, media_id, format_id)
media_id, 'Downloading %s token' % format_id) if ext == 'f4m':
auth_params = xpath_text(token, './/authparams', 'auth params') formats.extend(self._extract_f4m_formats(
if not auth_params: format_url + ('?' if '?' not in format_url else '&') + 'hdcore=3.4.0',
continue media_id, f4m_id=format_id, fatal=False))
formats.extend(self._extract_f4m_formats( else:
'%s?%s&hdcore=3.4.0&plugin=aasp-3.4.0.132.66' % (format_url, auth_params), formats.extend(self._extract_m3u8_formats(
media_id, f4m_id=format_id, fatal=False)) format_url, media_id, 'mp4', 'm3u8_native', m3u8_id=format_id, fatal=False))
elif format_url.endswith('.m3u8'):
formats.extend(self._extract_m3u8_formats(
format_url, media_id, 'mp4', 'm3u8_native', m3u8_id=format_id, fatal=False))
else: else:
formats.append({ formats.append({
'format_id': format_id, 'format_id': format_id,
@ -205,25 +194,37 @@ class RTSIE(SRGSSRIE):
'tbr': extract_bitrate(format_url), 'tbr': extract_bitrate(format_url),
}) })
if 'media' in info: for media in info.get('media', []):
formats.extend([{ media_url = media.get('url')
'format_id': '%s-%sk' % (media['ext'], media['rate']), if not media_url or re.match(r'https?://', media_url):
'url': 'http://download-video.rts.ch/%s' % media['url'], continue
'tbr': media['rate'] or extract_bitrate(media['url']), rate = media.get('rate')
} for media in info['media'] if media.get('rate')]) ext = media.get('ext') or determine_ext(media_url, 'mp4')
format_id = ext
if rate:
format_id += '-%dk' % rate
formats.append({
'format_id': format_id,
'url': 'http://download-video.rts.ch/' + media_url,
'tbr': rate or extract_bitrate(media_url),
})
self._check_formats(formats, media_id) self._check_formats(formats, media_id)
self._sort_formats(formats) self._sort_formats(formats)
duration = info.get('duration') or info.get('cutout') or info.get('cutduration')
if isinstance(duration, compat_str):
duration = parse_duration(duration)
return { return {
'id': media_id, 'id': media_id,
'display_id': display_id, 'display_id': display_id,
'formats': formats, 'formats': formats,
'title': info['title'], 'title': title,
'description': info.get('intro'), 'description': info.get('intro'),
'duration': duration, 'duration': duration,
'view_count': view_count, 'view_count': int_or_none(info.get('plays')),
'uploader': info.get('programName'), 'uploader': info.get('programName'),
'timestamp': upload_timestamp, 'timestamp': parse_iso8601(info.get('broadcast_date')),
'thumbnail': thumbnail, 'thumbnail': unescapeHTML(info.get('preview_image_url')),
} }

33
youtube_dl/extractor/srgssr.py
View File

@ -4,6 +4,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse_urlparse
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
parse_iso8601, parse_iso8601,
@ -23,6 +24,16 @@ class SRGSSRIE(InfoExtractor):
'STARTDATE': 'This video is not yet available. Please try again later.', 'STARTDATE': 'This video is not yet available. Please try again later.',
} }
def _get_tokenized_src(self, url, video_id, format_id):
sp = compat_urllib_parse_urlparse(url).path.split('/')
token = self._download_json(
'http://tp.srgssr.ch/akahd/token?acl=/%s/%s/*' % (sp[1], sp[2]),
video_id, 'Downloading %s token' % format_id, fatal=False) or {}
auth_params = token.get('token', {}).get('authparams')
if auth_params:
url += '?' + auth_params
return url
def get_media_data(self, bu, media_type, media_id): def get_media_data(self, bu, media_type, media_id):
media_data = self._download_json( media_data = self._download_json(
'http://il.srgssr.ch/integrationlayer/1.0/ue/%s/%s/play/%s.json' % (bu, media_type, media_id), 'http://il.srgssr.ch/integrationlayer/1.0/ue/%s/%s/play/%s.json' % (bu, media_type, media_id),
@ -61,14 +72,16 @@ class SRGSSRIE(InfoExtractor):
asset_url = asset['text'] asset_url = asset['text']
quality = asset['@quality'] quality = asset['@quality']
format_id = '%s-%s' % (protocol, quality) format_id = '%s-%s' % (protocol, quality)
if protocol == 'HTTP-HDS': if protocol.startswith('HTTP-HDS') or protocol.startswith('HTTP-HLS'):
formats.extend(self._extract_f4m_formats( asset_url = self._get_tokenized_src(asset_url, media_id, format_id)
asset_url + '?hdcore=3.4.0', media_id, if protocol.startswith('HTTP-HDS'):
f4m_id=format_id, fatal=False)) formats.extend(self._extract_f4m_formats(
elif protocol == 'HTTP-HLS': asset_url + ('?' if '?' not in asset_url else '&') + 'hdcore=3.4.0',
formats.extend(self._extract_m3u8_formats( media_id, f4m_id=format_id, fatal=False))
asset_url, media_id, 'mp4', 'm3u8_native', elif protocol.startswith('HTTP-HLS'):
m3u8_id=format_id, fatal=False)) formats.extend(self._extract_m3u8_formats(
asset_url, media_id, 'mp4', 'm3u8_native',
m3u8_id=format_id, fatal=False))
else: else:
formats.append({ formats.append({
'format_id': format_id, 'format_id': format_id,
@ -94,10 +107,10 @@ class SRGSSRPlayIE(InfoExtractor):
_TESTS = [{ _TESTS = [{
'url': 'http://www.srf.ch/play/tv/10vor10/video/snowden-beantragt-asyl-in-russland?id=28e1a57d-5b76-4399-8ab3-9097f071e6c5', 'url': 'http://www.srf.ch/play/tv/10vor10/video/snowden-beantragt-asyl-in-russland?id=28e1a57d-5b76-4399-8ab3-9097f071e6c5',
'md5': '4cd93523723beff51bb4bee974ee238d', 'md5': 'da6b5b3ac9fa4761a942331cef20fcb3',
'info_dict': { 'info_dict': {
'id': '28e1a57d-5b76-4399-8ab3-9097f071e6c5', 'id': '28e1a57d-5b76-4399-8ab3-9097f071e6c5',
'ext': 'm4v', 'ext': 'mp4',
'upload_date': '20130701', 'upload_date': '20130701',
'title': 'Snowden beantragt Asyl in Russland', 'title': 'Snowden beantragt Asyl in Russland',
'timestamp': 1372713995, 'timestamp': 1372713995,