yt_dlp/extractor/francetv.py

@@ -5,8 +5,6 @@ from ..utils import (
     format_field,
     parse_iso8601,
     parse_qs,
-    join_nonempty,
-    int_or_none,
 )
 from .dailymotion import DailymotionIE
 
@@ -48,6 +46,22 @@ class FranceTVIE(InfoExtractor):
             'timestamp': 1502623500,
             'upload_date': '20170813',
         },
+    }, {
+        'url': 'https://www.france.tv/enfants/six-huit-ans/foot2rue/saison-1/3066387-duel-au-vieux-port.html',
+        'info_dict': {
+            'id': 'a9050959-eedd-4b4a-9b0d-de6eeaa73e44',
+            'ext': 'mp4',
+            'title': 'Foot2Rue - Duel au vieux port',
+            'episode': 'Duel au vieux port',
+            'series': 'Foot2Rue',
+            'episode_number': 1,
+            'season_number': 1,
+            'timestamp': 1642761360,
+            'upload_date': '20220121',
+            'season': 'Season 1',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 1441,
+        },
     }, {
         # with catalog
         'url': 'https://sivideo.webservices.francetelevisions.fr/tools/getInfosOeuvre/v2/?idDiffusion=NI_1004933&catalogue=Zouzous&callback=_jsonp_loader_callback_request_4',
@@ -84,8 +98,8 @@ class FranceTVIE(InfoExtractor):
         videos = []
         title = None
         subtitle = None
-        episode_number = None
+        episode = None
-        season_number = None
+        series = None
         image = None
         duration = None
         timestamp = None
@@ -102,6 +116,8 @@ class FranceTVIE(InfoExtractor):
             if not dinfo:
                 continue
 
+            print(dinfo)
+
             video = dinfo.get('video')
             if video:
                 videos.append(video)
@@ -118,7 +134,7 @@ class FranceTVIE(InfoExtractor):
                     title = meta.get('title')
                 # meta['pre_title'] contains season and episode number for series in format "S<ID> E<ID>"
                 season_number, episode_number = self._search_regex(
-                    r'S(\d+)\s*E(\d+)', meta.get('pre_title'), 'episode info', group=(1, 2), default=(None, None))
+                        r'S(\d+)\s*E(\d+)', meta.get('pre_title'), 'episode info', group=(1, 2), default=(None, None))
                 if subtitle is None:
                     subtitle = meta.get('additional_title')
                 if image is None:
@@ -199,7 +215,7 @@ class FranceTVIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': join_nonempty(title, subtitle, delim=' - ').strip(),
+            'title': (title + ' - %s' % subtitle if subtitle else title).strip(),
             'thumbnail': image,
             'duration': duration,
             'timestamp': timestamp,
@@ -208,8 +224,8 @@ class FranceTVIE(InfoExtractor):
             'subtitles': subtitles,
             'episode': subtitle if episode_number else None,
             'series': title if episode_number else None,
-            'episode_number': int_or_none(episode_number),
+            'episode_number': int(episode_number) if episode_number else None,
-            'season_number': int_or_none(season_number),
+            'season_number': int(season_number) if season_number else None,
         }
 
     def _real_extract(self, url):
@@ -236,31 +252,14 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
             'id': 'ec217ecc-0733-48cf-ac06-af1347b849d1',
             'ext': 'mp4',
             'title': '13h15, le dimanche... - Les mystères de Jésus',
+            'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
             'timestamp': 1502623500,
-            'duration': 2580,
-            'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20170813',
         },
         'params': {
             'skip_download': True,
         },
         'add_ie': [FranceTVIE.ie_key()],
-    }, {
-        'url': 'https://www.france.tv/enfants/six-huit-ans/foot2rue/saison-1/3066387-duel-au-vieux-port.html',
-        'info_dict': {
-            'id': 'a9050959-eedd-4b4a-9b0d-de6eeaa73e44',
-            'ext': 'mp4',
-            'title': 'Foot2Rue - Duel au vieux port',
-            'episode': 'Duel au vieux port',
-            'series': 'Foot2Rue',
-            'episode_number': 1,
-            'season_number': 1,
-            'timestamp': 1642761360,
-            'upload_date': '20220121',
-            'season': 'Season 1',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 1441,
-        },
     }, {
         # france3
         'url': 'https://www.france.tv/france-3/des-chiffres-et-des-lettres/139063-emission-du-mardi-9-mai-2017.html',