From 441987f7f08cce886a1cae0522c14aa6f1040185 Mon Sep 17 00:00:00 2001 From: Triagoz <48069904+Triagoz@users.noreply.github.com> Date: Wed, 27 Feb 2019 21:44:18 +0100 Subject: [PATCH 1/2] Update regex for finding video_id. www.france.tv site has been updated and previous regex didn't find the video_id any more. Proposed change fixes this. Should solve issue #20029. --- youtube_dl/extractor/francetv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index 2ffe83a78..04aba409a 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -271,7 +271,7 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor): catalogue = None video_id = self._search_regex( - r'data-main-video=(["\'])(?P(?:(?!\1).)+)\1', + r'videoId:\s*(["\'])(?P(?:(?!\1).)+)\1', webpage, 'video id', default=None, group='id') if not video_id: From 01c6c7b8a184ac3b9ed29b91967a8250279ebe15 Mon Sep 17 00:00:00 2001 From: Triagoz Date: Wed, 27 Feb 2019 23:50:26 +0100 Subject: [PATCH 2/2] Restores original regex. --- youtube_dl/extractor/francetv.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index 04aba409a..2a1f5e5e1 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -271,9 +271,14 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor): catalogue = None video_id = self._search_regex( - r'videoId:\s*(["\'])(?P(?:(?!\1).)+)\1', + r'data-main-video=(["\'])(?P(?:(?!\1).)+)\1', webpage, 'video id', default=None, group='id') + if not video_id: + video_id = self._search_regex( + r'videoId:\s*(["\'])(?P(?:(?!\1).)+)\1', + webpage, 'video id', default=None, group='id') + if not video_id: video_id, catalogue = self._html_search_regex( r'(?:href=|player\.setVideo\(\s*)"http://videos?\.francetv\.fr/video/([^@]+@[^"]+)"',