aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-09-01 22:37:42 +0600
committerSergey M․ <dstftw@gmail.com>2015-09-01 22:37:42 +0600
commit36c15522c121c0ffeb5208847a4f5461adc4f3b5 (patch)
treea5eca7e1aef0aa04805b96a0c98e3236d5c5787e /youtube_dl/extractor
parent804c343a4ff252c46fcc4a36f73a913c8def9b93 (diff)
[francetv] Use subtitle when present (Closes #6715)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/francetv.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/youtube_dl/extractor/francetv.py b/youtube_dl/extractor/francetv.py
index 75723c00d..c053774b9 100644
--- 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']),