projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #7320 from remitamine/adobetv
[youtube-dl]
/
youtube_dl
/
extractor
/
rtbf.py
diff --git
a/youtube_dl/extractor/rtbf.py
b/youtube_dl/extractor/rtbf.py
index 5a381d9ced41516db44d7e17120b29948a1957cb..e42b319a3e224aa6b078cad7756e5c44b7f620d8 100644
(file)
--- a/
youtube_dl/extractor/rtbf.py
+++ b/
youtube_dl/extractor/rtbf.py
@@
-9,8
+9,8
@@
from ..utils import (
class RTBFIE(InfoExtractor):
class RTBFIE(InfoExtractor):
- _VALID_URL = r'https?://
www.rtbf.be/video/[^\?]+\?id=
(?P<id>\d+)'
- _TEST
=
{
+ _VALID_URL = r'https?://
(?:www\.)?rtbf\.be/(?:video/[^?]+\?.*\bid=|ouftivi/(?:[^/]+/)*[^?]+\?.*\bvideoId=)
(?P<id>\d+)'
+ _TEST
S = [
{
'url': 'https://www.rtbf.be/video/detail_les-diables-au-coeur-episode-2?id=1921274',
'md5': '799f334ddf2c0a582ba80c44655be570',
'info_dict': {
'url': 'https://www.rtbf.be/video/detail_les-diables-au-coeur-episode-2?id=1921274',
'md5': '799f334ddf2c0a582ba80c44655be570',
'info_dict': {
@@
-19,7
+19,21
@@
class RTBFIE(InfoExtractor):
'title': 'Les Diables au coeur (épisode 2)',
'duration': 3099,
}
'title': 'Les Diables au coeur (épisode 2)',
'duration': 3099,
}
- }
+ }, {
+ # 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,
+ }]
+
+ _QUALITIES = [
+ ('mobile', 'mobile'),
+ ('web', 'SD'),
+ ('url', 'MD'),
+ ('high', 'HD'),
+ ]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
@@
-29,17
+43,24
@@
class RTBFIE(InfoExtractor):
data = self._parse_json(
unescapeHTML(self._search_regex(
data = self._parse_json(
unescapeHTML(self._search_regex(
- r'data-
video
="([^"]+)"', webpage, 'data video')),
+ r'data-
media
="([^"]+)"', webpage, 'data video')),
video_id)
video_id)
- video_url = data.get('downloadUrl') or data.get('url')
-
if data.get('provider').lower() == 'youtube':
if data.get('provider').lower() == 'youtube':
+ video_url = data.get('downloadUrl') or data.get('url')
return self.url_result(video_url, 'Youtube')
return self.url_result(video_url, 'Youtube')
+ formats = []
+ for key, format_id in self._QUALITIES:
+ format_url = data['sources'].get(key)
+ if format_url:
+ formats.append({
+ 'format_id': format_id,
+ 'url': format_url,
+ })
return {
'id': video_id,
return {
'id': video_id,
- '
url': video_url
,
+ '
formats': formats
,
'title': data['title'],
'description': data.get('description') or data.get('subtitle'),
'thumbnail': data.get('thumbnail'),
'title': data['title'],
'description': data.get('description') or data.get('subtitle'),
'thumbnail': data.get('thumbnail'),