update from upstream

1 files changed, 25 insertions, 4 deletions

diff --git a/hypervideo_dl/extractor/rmcdecouverte.py b/hypervideo_dl/extractor/rmcdecouverte.py
index c3623ed..422d47a 100644
--- a/hypervideo_dl/extractor/rmcdecouverte.py
+++ b/hypervideo_dl/extractor/rmcdecouverte.py
@@ -1,7 +1,6 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import re
 
 from .common import InfoExtractor
 from .brightcove import BrightcoveLegacyIE
@@ -13,9 +12,24 @@ from ..utils import smuggle_url
 
 
 class RMCDecouverteIE(InfoExtractor):
-    _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/(?:(?:[^/]+/)*program_(?P<id>\d+)|(?P<live_id>mediaplayer-direct))'
+    _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/(?:[^?#]*_(?P<id>\d+)|mediaplayer-direct)/?(?:[#?]|$)'
 
     _TESTS = [{
+        'url': 'https://rmcdecouverte.bfmtv.com/vestiges-de-guerre_22240/les-bunkers-secrets-domaha-beach_25303/',
+        'info_dict': {
+            'id': '6250879771001',
+            'ext': 'mp4',
+            'title': 'LES BUNKERS SECRETS D´OMAHA BEACH',
+            'uploader_id': '1969646226001',
+            'description': 'md5:aed573ca24abde62a148e0eba909657d',
+            'timestamp': 1619622984,
+            'upload_date': '20210428',
+        },
+        'params': {
+            'format': 'bestvideo',
+            'skip_download': True,
+        },
+    }, {
         'url': 'https://rmcdecouverte.bfmtv.com/wheeler-dealers-occasions-a-saisir/program_2566/',
         'info_dict': {
             'id': '5983675500001',
@@ -31,6 +45,13 @@ class RMCDecouverteIE(InfoExtractor):
         },
         'skip': 'only available for a week',
     }, {
+        'url': 'https://rmcdecouverte.bfmtv.com/avions-furtifs-la-technologie-de-lextreme_10598',
+        'only_matching': True,
+    }, {
+        # The website accepts any URL as long as it has _\d+ at the end
+        'url': 'https://rmcdecouverte.bfmtv.com/any/thing/can/go/here/_10598',
+        'only_matching': True,
+    }, {
         # live, geo restricted, bypassable
         'url': 'https://rmcdecouverte.bfmtv.com/mediaplayer-direct/',
         'only_matching': True,
@@ -38,8 +59,8 @@ class RMCDecouverteIE(InfoExtractor):
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1969646226001/default_default/index.html?videoId=%s'
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        display_id = mobj.group('id') or mobj.group('live_id')
+        mobj = self._match_valid_url(url)
+        display_id = mobj.group('id') or 'direct'
         webpage = self._download_webpage(url, display_id)
         brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
         if brightcove_legacy_url: