X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftoutv.py;h=f1ab91cf2bc3b4b7f29627f19c2c1163a7f9e85c;hb=3c9647372e78134777d201e157a5ef42345c9da2;hp=2f728d3dc08c6d1149fa30a43f48fce9999042ac;hpb=ea36cbac5e089d5e37a2f92ea58375a5883d0af2;p=youtube-dl diff --git a/youtube_dl/extractor/toutv.py b/youtube_dl/extractor/toutv.py index 2f728d3dc..f1ab91cf2 100644 --- a/youtube_dl/extractor/toutv.py +++ b/youtube_dl/extractor/toutv.py @@ -1,74 +1,99 @@ # coding: utf-8 +from __future__ import unicode_literals + import re -import xml.etree.ElementTree -from .common import InfoExtractor +from .radiocanada import RadioCanadaIE from ..utils import ( - ExtractorError, - unified_strdate, + extract_attributes, + int_or_none, + merge_dicts, + urlencode_postdata, ) -class TouTvIE(InfoExtractor): - IE_NAME = u'tou.tv' - _VALID_URL = r'https?://www\.tou\.tv/(?P[a-zA-Z0-9_-]+(?:/(?PS[0-9]+E[0-9]+)))' +class TouTvIE(RadioCanadaIE): + _NETRC_MACHINE = 'toutv' + IE_NAME = 'tou.tv' + _VALID_URL = r'https?://ici\.tou\.tv/(?P[a-zA-Z0-9_-]+(?:/S[0-9]+[EC][0-9]+)?)' - _TEST = { - u'url': u'http://www.tou.tv/30-vies/S04E41', - u'file': u'30-vies_S04E41.mp4', - u'info_dict': { - u'title': u'30 vies Saison 4 / Épisode 41', - u'description': u'md5:da363002db82ccbe4dafeb9cab039b09', - u'age_limit': 8, - u'uploader': u'Groupe des Nouveaux Médias', - u'duration': 1296, - u'upload_date': u'20131118', - u'thumbnail': u'http://static.tou.tv/medias/images/2013-11-18_19_00_00_30VIES_0341_01_L.jpeg', + _TESTS = [{ + 'url': 'http://ici.tou.tv/garfield-tout-court/S2015E17', + 'info_dict': { + 'id': '122017', + 'ext': 'mp4', + 'title': 'Saison 2015 Épisode 17', + 'description': 'La photo de famille 2', + 'upload_date': '20100717', }, - u'params': { - u'skip_download': True, # Requires rtmpdump + 'params': { + # m3u8 download + 'skip_download': True, }, - u'skip': 'Only available in Canada' - } - - def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - webpage = self._download_webpage(url, video_id) + 'skip': '404 Not Found', + }, { + 'url': 'http://ici.tou.tv/hackers', + 'only_matching': True, + }, { + 'url': 'https://ici.tou.tv/l-age-adulte/S01C501', + 'only_matching': True, + }] - mediaId = self._search_regex( - r'"idMedia":\s*"([^"]+)"', webpage, u'media ID') + def _real_initialize(self): + email, password = self._get_login_info() + if email is None: + return + login_webpage = self._download_webpage( + 'https://services.radio-canada.ca/auth/oauth/v2/authorize', + None, 'Downloading login page', query={ + 'client_id': '4dd36440-09d5-4468-8923-b6d91174ad36', + 'redirect_uri': 'https://ici.tou.tv/logincallback', + 'response_type': 'token', + 'scope': 'id.write media-validation.read', + 'state': '/', + }) - streams_url = u'http://release.theplatform.com/content.select?pid=' + mediaId - streams_webpage = self._download_webpage( - streams_url, video_id, note=u'Downloading stream list') + def extract_form_url_and_data(wp, default_form_url, form_spec_re=''): + form, form_elem = re.search( + r'(?s)((]+?%s[^>]*?>).+?)' % form_spec_re, wp).groups() + form_data = self._hidden_inputs(form) + form_url = extract_attributes(form_elem).get('action') or default_form_url + return form_url, form_data - streams_doc = xml.etree.ElementTree.fromstring( - streams_webpage.encode('utf-8')) - video_url = next(n.text - for n in streams_doc.findall('.//choice/url') - if u'//ad.doubleclick' not in n.text) - if video_url.endswith('/Unavailable.flv'): - raise ExtractorError( - u'Access to this video is blocked from outside of Canada', - expected=True) + post_url, form_data = extract_form_url_and_data( + login_webpage, + 'https://services.radio-canada.ca/auth/oauth/v2/authorize/login', + r'(?:id|name)="Form-login"') + form_data.update({ + 'login-email': email, + 'login-password': password, + }) + consent_webpage = self._download_webpage( + post_url, None, 'Logging in', data=urlencode_postdata(form_data)) + post_url, form_data = extract_form_url_and_data( + consent_webpage, + 'https://services.radio-canada.ca/auth/oauth/v2/authorize/consent') + _, urlh = self._download_webpage_handle( + post_url, None, 'Following Redirection', + data=urlencode_postdata(form_data)) + self._access_token = self._search_regex( + r'access_token=([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})', + urlh.geturl(), 'access token') + self._claims = self._call_api('validation/v2/getClaims')['claims'] - duration_str = self._html_search_meta( - 'video:duration', webpage, u'duration') - duration = int(duration_str) if duration_str else None - upload_date_str = self._html_search_meta( - 'video:release_date', webpage, u'upload date') - upload_date = unified_strdate(upload_date_str) if upload_date_str else None + def _real_extract(self, url): + path = self._match_id(url) + metadata = self._download_json('http://ici.tou.tv/presentation/%s' % path, path) + # IsDrm does not necessarily mean the video is DRM protected (see + # https://github.com/rg3/youtube-dl/issues/13994). + if metadata.get('IsDrm'): + self.report_warning('This video is probably DRM protected.', path) + video_id = metadata['IdMedia'] + details = metadata['Details'] - return { + return merge_dicts({ 'id': video_id, - 'title': self._og_search_title(webpage), - 'url': video_url, - 'description': self._og_search_description(webpage), - 'uploader': self._dc_search_uploader(webpage), - 'thumbnail': self._og_search_thumbnail(webpage), - 'age_limit': self._media_rating_search(webpage), - 'duration': duration, - 'upload_date': upload_date, - 'ext': 'mp4', - } + 'title': details.get('OriginalTitle'), + 'thumbnail': details.get('ImageUrl'), + 'duration': int_or_none(details.get('LengthInSeconds')), + }, self._extract_info(metadata.get('AppCode', 'toutv'), video_id))