From e1f2d4afeebd6be66f958dbdba1eb373c243daba Mon Sep 17 00:00:00 2001 From: midas02 Date: Sun, 30 Apr 2017 19:36:44 +0200 Subject: [PATCH 1/5] Update rmcdecouverte.py --- youtube_dl/extractor/rmcdecouverte.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index 2340dae53..17c898eab 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -13,7 +13,7 @@ class RMCDecouverteIE(InfoExtractor): _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/mediaplayer-replay.*?\bid=(?P\d+)' _TEST = { - 'url': 'http://rmcdecouverte.bfmtv.com/mediaplayer-replay/?id=1430&title=LES%20HEROS%20DU%2088e%20ETAGE', + 'url': 'http://rmcdecouverte.bfmtv.com/mediaplayer-replay/?id=116548', 'info_dict': { 'id': '5111223049001', 'ext': 'mp4', From 9288c8831ebb32aeab1ee917e15cd7ee4f997183 Mon Sep 17 00:00:00 2001 From: midas02 Date: Sun, 30 Apr 2017 19:41:17 +0200 Subject: [PATCH 2/5] [RMC Decouverte] Fix extractor Extractor was no longer working, fixed. --- youtube_dl/extractor/rmcdecouverte.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index 17c898eab..f80eac999 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -15,13 +15,13 @@ class RMCDecouverteIE(InfoExtractor): _TEST = { 'url': 'http://rmcdecouverte.bfmtv.com/mediaplayer-replay/?id=116548', 'info_dict': { - 'id': '5111223049001', + 'id': '5411254766001', 'ext': 'mp4', - 'title': ': LES HEROS DU 88e ETAGE', - 'description': 'Découvrez comment la bravoure de deux hommes dans la Tour Nord du World Trade Center a sauvé la vie d\'innombrables personnes le 11 septembre 2001.', + 'title': '39/45:LE RESEAU DES FAUX BILLETS', + 'description': 'ic Brunet propose un nouvel \u00e9pisode des Grains de sable de l\'Histoire sur la plus grosse affaire de contrefa\u00e7on de la Seconde Guerre mondiale.', 'uploader_id': '1969646226001', - 'upload_date': '20160904', - 'timestamp': 1472951103, + 'upload_date': '20170426', + 'timestamp': 1493166610, }, 'params': { # rtmp download @@ -35,5 +35,8 @@ class RMCDecouverteIE(InfoExtractor): video_id = self._match_id(url) webpage = self._download_webpage(url, video_id) brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage) - brightcove_id = compat_parse_qs(compat_urlparse.urlparse(brightcove_legacy_url).query)['@videoPlayer'][0] + if brightcove_legacy_url: + brightcove_id = compat_parse_qs(compat_urlparse.urlparse(brightcove_legacy_url).query)['@videoPlayer'][0] + else: + brightcove_id = self._html_search_regex(r'data-video-id="(.*?)"', webpage, 'error message', default=None) return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id) From d848147a332e6dab27e4f8f5cb3a0273ecc40c8a Mon Sep 17 00:00:00 2001 From: midas02 Date: Mon, 1 May 2017 19:23:52 +0200 Subject: [PATCH 3/5] Removing default value for brightcove_id --- youtube_dl/extractor/rmcdecouverte.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index f80eac999..27ccd9e6b 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -38,5 +38,5 @@ class RMCDecouverteIE(InfoExtractor): if brightcove_legacy_url: brightcove_id = compat_parse_qs(compat_urlparse.urlparse(brightcove_legacy_url).query)['@videoPlayer'][0] else: - brightcove_id = self._html_search_regex(r'data-video-id="(.*?)"', webpage, 'error message', default=None) + brightcove_id = self._html_search_regex(r'data-video-id="(.*?)"', webpage, 'error message') return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id) From b7c2bce0cb0f1d0cc3f26dfe2f063d14b00db87c Mon Sep 17 00:00:00 2001 From: midas02 Date: Mon, 1 May 2017 20:15:11 +0200 Subject: [PATCH 4/5] adding error message --- youtube_dl/extractor/rmcdecouverte.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index 27ccd9e6b..1d3296970 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -38,5 +38,5 @@ class RMCDecouverteIE(InfoExtractor): if brightcove_legacy_url: brightcove_id = compat_parse_qs(compat_urlparse.urlparse(brightcove_legacy_url).query)['@videoPlayer'][0] else: - brightcove_id = self._html_search_regex(r'data-video-id="(.*?)"', webpage, 'error message') + brightcove_id = self._html_search_regex(r'data-video-id="(.*?)"', webpage, 'brightcove_id') return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id) From 0311562081cf9ba8abc8232722be98914cb90cb6 Mon Sep 17 00:00:00 2001 From: midas02 Date: Mon, 1 May 2017 20:32:47 +0200 Subject: [PATCH 5/5] No need for a html_search - fixed typo in the test --- youtube_dl/extractor/rmcdecouverte.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dl/extractor/rmcdecouverte.py index 1d3296970..f6ef6d747 100644 --- a/youtube_dl/extractor/rmcdecouverte.py +++ b/youtube_dl/extractor/rmcdecouverte.py @@ -13,7 +13,7 @@ class RMCDecouverteIE(InfoExtractor): _VALID_URL = r'https?://rmcdecouverte\.bfmtv\.com/mediaplayer-replay.*?\bid=(?P\d+)' _TEST = { - 'url': 'http://rmcdecouverte.bfmtv.com/mediaplayer-replay/?id=116548', + 'url': 'http://rmcdecouverte.bfmtv.com/mediaplayer-replay/?id=16548', 'info_dict': { 'id': '5411254766001', 'ext': 'mp4', @@ -38,5 +38,5 @@ class RMCDecouverteIE(InfoExtractor): if brightcove_legacy_url: brightcove_id = compat_parse_qs(compat_urlparse.urlparse(brightcove_legacy_url).query)['@videoPlayer'][0] else: - brightcove_id = self._html_search_regex(r'data-video-id="(.*?)"', webpage, 'brightcove_id') + brightcove_id = self._search_regex(r'data-video-id="(.*?)"', webpage, 'brightcove_id') return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id)