X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Frtbf.py;h=28cc5522d89083cec2ad7631d51fb0aa0798ccbd;hb=54fc90aabfb71968f28af68dfe3f7a3544cc2f0b;hp=b70c36eaa47fb46b26c9c612cb61eddf34886acc;hpb=201e3c99b9f02afbee47512ce4ea2474d22f81d6;p=youtube-dl
diff --git a/youtube_dl/extractor/rtbf.py b/youtube_dl/extractor/rtbf.py
index b70c36eaa..28cc5522d 100644
--- a/youtube_dl/extractor/rtbf.py
+++ b/youtube_dl/extractor/rtbf.py
@@ -1,49 +1,98 @@
# coding: utf-8
from __future__ import unicode_literals
-import re
-import json
-
from .common import InfoExtractor
-from ..utils import clean_html
+from ..utils import (
+ int_or_none,
+ ExtractorError,
+)
+
-class RTBFVideoIE(InfoExtractor):
- _VALID_URL = r'https?://www.rtbf.be/video/(?P
[^?]+)\?.*id=(?P[0-9]+)'
- _TEST = {
+class RTBFIE(InfoExtractor):
+ _VALID_URL = r'''(?x)
+ https?://(?:www\.)?rtbf\.be/
+ (?:
+ video/[^?]+\?.*\bid=|
+ ouftivi/(?:[^/]+/)*[^?]+\?.*\bvideoId=|
+ auvio/[^/]+\?.*id=
+ )(?P\d+)'''
+ _TESTS = [{
'url': 'https://www.rtbf.be/video/detail_les-diables-au-coeur-episode-2?id=1921274',
'md5': '799f334ddf2c0a582ba80c44655be570',
'info_dict': {
'id': '1921274',
'ext': 'mp4',
'title': 'Les Diables au coeur (épisode 2)',
+ 'description': 'Football - Diables Rouges',
'duration': 3099,
+ 'upload_date': '20140425',
+ 'timestamp': 1398456336,
+ 'uploader': 'rtbfsport',
}
+ }, {
+ # geo restricted
+ 'url': 'http://www.rtbf.be/ouftivi/heros/detail_scooby-doo-mysteres-associes?id=1097&videoId=2057442',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.rtbf.be/ouftivi/niouzz?videoId=2055858',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.rtbf.be/auvio/detail_jeudi-en-prime-siegfried-bracke?id=2102996',
+ 'only_matching': True,
+ }]
+ _IMAGE_HOST = 'http://ds1.ds.static.rtbf.be'
+ _PROVIDERS = {
+ 'YOUTUBE': 'Youtube',
+ 'DAILYMOTION': 'Dailymotion',
+ 'VIMEO': 'Vimeo',
}
+ _QUALITIES = [
+ ('mobile', 'SD'),
+ ('web', 'MD'),
+ ('high', 'HD'),
+ ]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
- # TODO more code goes here, for example ...
- webpage = self._download_webpage(url, video_id)
- title = self._html_search_regex(
- r']*src="([^"]+)"',
- webpage, 'iframe')
- iframe = self._download_webpage(iframe_url, video_id)
-
- data_video_idx = iframe.find('data-video')
- next_data_idx = iframe.find('data-', data_video_idx + 1)
- json_data_start = data_video_idx + len('data-video=') + 1
- json_data_end = next_data_idx - 2
- video_data = json.loads(clean_html(iframe[json_data_start:json_data_end]))
+ video_id = self._match_id(url)
+ data = self._download_json(
+ 'http://www.rtbf.be/api/media/video?method=getVideoDetail&args[]=%s' % video_id, video_id)
+
+ error = data.get('error')
+ if error:
+ raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
+
+ data = data['data']
+
+ provider = data.get('provider')
+ if provider in self._PROVIDERS:
+ return self.url_result(data['url'], self._PROVIDERS[provider])
+
+ formats = []
+ for key, format_id in self._QUALITIES:
+ format_url = data.get(key + 'Url')
+ if format_url:
+ formats.append({
+ 'format_id': format_id,
+ 'url': format_url,
+ })
+
+ thumbnails = []
+ for thumbnail_id, thumbnail_url in data.get('thumbnail', {}).items():
+ if thumbnail_id != 'default':
+ thumbnails.append({
+ 'url': self._IMAGE_HOST + thumbnail_url,
+ 'id': thumbnail_id,
+ })
return {
'id': video_id,
- 'title': title,
- 'url': video_data['data']['downloadUrl'],
- 'duration': video_data['data']['duration'],
+ 'formats': formats,
+ 'title': data['title'],
+ 'description': data.get('description') or data.get('subtitle'),
+ 'thumbnails': thumbnails,
+ 'duration': data.get('duration') or data.get('realDuration'),
+ 'timestamp': int_or_none(data.get('created')),
+ 'view_count': int_or_none(data.get('viewCount')),
+ 'uploader': data.get('channel'),
+ 'tags': data.get('tags'),
}