mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
[francetv] Improve formats extraction
This commit is contained in:
parent
db264e3cc3
commit
3c20208eff
@ -60,22 +60,24 @@ def _extract_video(self, video_id, catalogue):
|
|||||||
video_id, 'Downloading f4m manifest token', fatal=False)
|
video_id, 'Downloading f4m manifest token', fatal=False)
|
||||||
if f4m_url:
|
if f4m_url:
|
||||||
formats.extend(self._extract_f4m_formats(
|
formats.extend(self._extract_f4m_formats(
|
||||||
f4m_url + '&hdcore=3.7.0&plugin=aasp-3.7.0.39.44', video_id, 1, format_id))
|
f4m_url + '&hdcore=3.7.0&plugin=aasp-3.7.0.39.44',
|
||||||
|
video_id, f4m_id=format_id, fatal=False))
|
||||||
elif ext == 'm3u8':
|
elif ext == 'm3u8':
|
||||||
formats.extend(self._extract_m3u8_formats(video_url, video_id, 'mp4', m3u8_id=format_id))
|
formats.extend(self._extract_m3u8_formats(
|
||||||
|
video_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
||||||
|
m3u8_id=format_id, fatal=False))
|
||||||
elif video_url.startswith('rtmp'):
|
elif video_url.startswith('rtmp'):
|
||||||
formats.append({
|
formats.append({
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'format_id': 'rtmp-%s' % format_id,
|
'format_id': 'rtmp-%s' % format_id,
|
||||||
'ext': 'flv',
|
'ext': 'flv',
|
||||||
'preference': 1,
|
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
formats.append({
|
if self._is_valid_url(video_url, video_id, format_id):
|
||||||
'url': video_url,
|
formats.append({
|
||||||
'format_id': format_id,
|
'url': video_url,
|
||||||
'preference': -1,
|
'format_id': format_id,
|
||||||
})
|
})
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
|
|
||||||
title = info['titre']
|
title = info['titre']
|
||||||
@ -132,7 +134,7 @@ class FranceTvInfoIE(FranceTVBaseInfoExtractor):
|
|||||||
'url': 'http://www.francetvinfo.fr/replay-jt/france-3/soir-3/jt-grand-soir-3-lundi-26-aout-2013_393427.html',
|
'url': 'http://www.francetvinfo.fr/replay-jt/france-3/soir-3/jt-grand-soir-3-lundi-26-aout-2013_393427.html',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '84981923',
|
'id': '84981923',
|
||||||
'ext': 'flv',
|
'ext': 'mp4',
|
||||||
'title': 'Soir 3',
|
'title': 'Soir 3',
|
||||||
'upload_date': '20130826',
|
'upload_date': '20130826',
|
||||||
'timestamp': 1377548400,
|
'timestamp': 1377548400,
|
||||||
@ -140,6 +142,10 @@ class FranceTvInfoIE(FranceTVBaseInfoExtractor):
|
|||||||
'fr': 'mincount:2',
|
'fr': 'mincount:2',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
'params': {
|
||||||
|
# m3u8 downloads
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.francetvinfo.fr/elections/europeennes/direct-europeennes-regardez-le-debat-entre-les-candidats-a-la-presidence-de-la-commission_600639.html',
|
'url': 'http://www.francetvinfo.fr/elections/europeennes/direct-europeennes-regardez-le-debat-entre-les-candidats-a-la-presidence-de-la-commission_600639.html',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -156,17 +162,23 @@ class FranceTvInfoIE(FranceTVBaseInfoExtractor):
|
|||||||
'url': 'http://www.francetvinfo.fr/economie/entreprises/les-entreprises-familiales-le-secret-de-la-reussite_933271.html',
|
'url': 'http://www.francetvinfo.fr/economie/entreprises/les-entreprises-familiales-le-secret-de-la-reussite_933271.html',
|
||||||
'md5': 'f485bda6e185e7d15dbc69b72bae993e',
|
'md5': 'f485bda6e185e7d15dbc69b72bae993e',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '556e03339473995ee145930c',
|
'id': 'NI_173343',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Les entreprises familiales : le secret de la réussite',
|
'title': 'Les entreprises familiales : le secret de la réussite',
|
||||||
'thumbnail': 're:^https?://.*\.jpe?g$',
|
'thumbnail': 're:^https?://.*\.jpe?g$',
|
||||||
}
|
'timestamp': 1433273139,
|
||||||
|
'upload_date': '20150602',
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
# m3u8 downloads
|
||||||
|
'skip_download': True,
|
||||||
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://france3-regions.francetvinfo.fr/bretagne/cotes-d-armor/thalassa-echappee-breizh-ce-venredi-dans-les-cotes-d-armor-954961.html',
|
'url': 'http://france3-regions.francetvinfo.fr/bretagne/cotes-d-armor/thalassa-echappee-breizh-ce-venredi-dans-les-cotes-d-armor-954961.html',
|
||||||
'md5': 'f485bda6e185e7d15dbc69b72bae993e',
|
'md5': 'f485bda6e185e7d15dbc69b72bae993e',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'NI_657393',
|
'id': 'NI_657393',
|
||||||
'ext': 'flv',
|
'ext': 'mp4',
|
||||||
'title': 'Olivier Monthus, réalisateur de "Bretagne, le choix de l’Armor"',
|
'title': 'Olivier Monthus, réalisateur de "Bretagne, le choix de l’Armor"',
|
||||||
'description': 'md5:a3264114c9d29aeca11ced113c37b16c',
|
'description': 'md5:a3264114c9d29aeca11ced113c37b16c',
|
||||||
'thumbnail': 're:^https?://.*\.jpe?g$',
|
'thumbnail': 're:^https?://.*\.jpe?g$',
|
||||||
|
Loading…
Reference in New Issue
Block a user