[francetv] Use subtitle when present (Closes #6715)

[youtube-dl] / youtube_dl / extractor / francetv.py

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index 706ed9c994a3a0ae4a45fb4a3b2e31023e39f995..c053774b912a66c327042c95d62f003fd8ad0e19 100644 (file)
--- a/youtube_dl/extractor/francetv.py
+++ b/youtube_dl/extractor/francetv.py
@@ -78,9 +78,14 @@ class FranceTVBaseInfoExtractor(InfoExtractor):
                 })
         self._sort_formats(formats)
 
+        title = info['titre']
+        subtitle = info.get('sous_titre')
+        if subtitle:
+            title += ' - %s' % subtitle
+
         return {
             'id': video_id,
-            'title': info['titre'],
+            'title': title,
             'description': clean_html(info['synopsis']),
             'thumbnail': compat_urlparse.urljoin('http://pluzz.francetv.fr', info['image']),
             'duration': int_or_none(info.get('real_duration')) or parse_duration(info['duree']),
@@ -161,7 +166,8 @@ class FranceTVIE(FranceTVBaseInfoExtractor):
                         (?:
                             (?:www\.)?france[2345o]\.fr/
                                 (?:
-                                    emissions/[^/]+/(?:videos|diffusions)?|
+                                    emissions/[^/]+/(?:videos|diffusions)|
+                                    emission/[^/]+|
                                     videos|
                                     jt
                                 )