Rapsys Git
/
youtubedl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update changelog.
[youtubedl]
/
youtube_dl
/
extractor
/
rmcdecouverte.py
diff --git
a/youtube_dl/extractor/rmcdecouverte.py
b/youtube_dl/extractor/rmcdecouverte.py
index e921ca3e6204a3f4dcd892c3e18b00e6148d4cc8..c3623edcc7adc3fad26d769d79c7088fc98c2593 100644
(file)
--- a/
youtube_dl/extractor/rmcdecouverte.py
+++ b/
youtube_dl/extractor/rmcdecouverte.py
@@
-1,38
+1,46
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
+import re
+
from .common import InfoExtractor
from .brightcove import BrightcoveLegacyIE
from ..compat import (
compat_parse_qs,
compat_urlparse,
)
from .common import InfoExtractor
from .brightcove import BrightcoveLegacyIE
from ..compat import (
compat_parse_qs,
compat_urlparse,
)
+from ..utils import smuggle_url
class RMCDecouverteIE(InfoExtractor):
class RMCDecouverteIE(InfoExtractor):
- _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/
mediaplayer-replay.*?\bid=(?P<id>\d+
)'
+ _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/
(?:(?:[^/]+/)*program_(?P<id>\d+)|(?P<live_id>mediaplayer-direct)
)'
- _TEST
=
{
- 'url': 'http
://rmcdecouverte.bfmtv.com/mediaplayer-replay/?id=13502&title=AQUAMEN:LES%20ROIS%20DES%20AQUARIUMS%20:UN%20DELICIEUX%20PROJET
',
+ _TEST
S = [
{
+ 'url': 'http
s://rmcdecouverte.bfmtv.com/wheeler-dealers-occasions-a-saisir/program_2566/
',
'info_dict': {
'info_dict': {
- 'id': '5
419055995
001',
+ 'id': '5
983675500
001',
'ext': 'mp4',
'ext': 'mp4',
- 'title': '
UN DELICIEUX PROJET
',
- 'description': 'md5:
63610df7c8b1fc1698acd4d0d90ba8b5
',
+ 'title': '
CORVETTE
',
+ 'description': 'md5:
c1e8295521e45ffebf635d6a7658f506
',
'uploader_id': '1969646226001',
'uploader_id': '1969646226001',
- 'upload_date': '201
70502
',
- 'timestamp': 1
493745308
,
+ 'upload_date': '201
81226
',
+ 'timestamp': 1
545861635
,
},
'params': {
'skip_download': True,
},
'skip': 'only available for a week',
},
'params': {
'skip_download': True,
},
'skip': 'only available for a week',
- }
+ }, {
+ # live, geo restricted, bypassable
+ 'url': 'https://rmcdecouverte.bfmtv.com/mediaplayer-direct/',
+ 'only_matching': True,
+ }]
BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1969646226001/default_default/index.html?videoId=%s'
def _real_extract(self, url):
BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1969646226001/default_default/index.html?videoId=%s'
def _real_extract(self, url):
- video_id = self._match_id(url)
- webpage = self._download_webpage(url, video_id)
+ mobj = re.match(self._VALID_URL, url)
+ display_id = mobj.group('id') or mobj.group('live_id')
+ webpage = self._download_webpage(url, display_id)
brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
if brightcove_legacy_url:
brightcove_id = compat_parse_qs(compat_urlparse.urlparse(
brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
if brightcove_legacy_url:
brightcove_id = compat_parse_qs(compat_urlparse.urlparse(
@@
-41,5
+49,7
@@
class RMCDecouverteIE(InfoExtractor):
brightcove_id = self._search_regex(
r'data-video-id=["\'](\d+)', webpage, 'brightcove id')
return self.url_result(
brightcove_id = self._search_regex(
r'data-video-id=["\'](\d+)', webpage, 'brightcove id')
return self.url_result(
- self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew',
- brightcove_id)
+ smuggle_url(
+ self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
+ {'geo_countries': ['FR']}),
+ 'BrightcoveNew', brightcove_id)