From d178af5ad25dedf29ddb5fe3f71e9634f765bc0e Mon Sep 17 00:00:00 2001 From: dirkf Date: Thu, 15 May 2025 16:34:51 +0100 Subject: [PATCH] Tweak regexesGo back Jack --- youtube_dl/extractor/francetv.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py index 164e90f99..9802442cc 100644 --- a/youtube_dl/extractor/francetv.py +++ b/youtube_dl/extractor/francetv.py @@ -269,6 +269,11 @@ class FranceTVIE(InfoExtractor): # 2017: Cette vidéo n'est pas disponible depuis le site web mobile (b/c DRM) drm_formats = True continue + elif code == 2007: + # 2007: Ce direct est terminé. + raise ExtractorError( + 'Live broadcast has ended; video unavailable.', + video_id=video_id, expected=True) self.report_warning('{0} said: "({1}) {2}"'.format( self.IE_NAME, code, clean_html(dinfo.get('message')))) continue @@ -326,7 +331,9 @@ class FranceTVIE(InfoExtractor): class FranceTVEmbedIE(FranceTVBaseIE): _VALID_URL = r'''(?x) https?://embed\.francetv\.fr(?:/?\?(?:.*&)?(?Pue)=|/) - (?P[\da-f]{32})(?:(?(ue)&|/?[?#]).*)?$ + # Say (?:...|) instead of (?:...)? when ... ends .* to avoid + # python/cpython#62847 (fixed from at least 3.5 and late 2.7) + (?P[\da-f]{32})(?:(?(ue)&|/?[?#]).*|)$``` ''' _TESTS = [{ 'url': 'http://embed.francetv.fr/?ue=7fd581a2ccf59d2fc5719c5c13cf6961',