diff options
| author | Sergey M․ <dstftw@gmail.com> | 2019-01-01 20:49:13 +0700 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2019-01-01 20:51:19 +0700 | 
| commit | d9f1123c08e21c7170b906c7de2562b7293f7a3c (patch) | |
| tree | b8a77c1f82e1529be0cb63a61ea86a80492c8404 | |
| parent | 3d8eb6beb9aa6545be3184761df12cdcd0cb2944 (diff) | |
[rmcdecouverte] Improve, bypass geo restriction and add support for live (closes #18697)
| -rw-r--r-- | youtube_dl/extractor/rmcdecouverte.py | 24 | 
1 files changed, 17 insertions, 7 deletions
| diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index c44b90274..c3623edcc 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -1,18 +1,21 @@  # 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 ..utils import smuggle_url  class RMCDecouverteIE(InfoExtractor): -    _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/.+/program_(?P<id>\d+)' +    _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/(?:(?:[^/]+/)*program_(?P<id>\d+)|(?P<live_id>mediaplayer-direct))' -    _TEST = { +    _TESTS = [{          'url': 'https://rmcdecouverte.bfmtv.com/wheeler-dealers-occasions-a-saisir/program_2566/',          'info_dict': {              'id': '5983675500001', @@ -27,12 +30,17 @@ class RMCDecouverteIE(InfoExtractor):              '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): -        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( @@ -41,5 +49,7 @@ class RMCDecouverteIE(InfoExtractor):              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) | 
