depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-30 06:01:50 +00:00
Code Issues Releases Wiki Activity

[npo] Compound title

Browse source
This commit is contained in:
Sergey M․ 2015-07-17 01:28:52 +06:00
parent 1540119723
commit 23fc384f2c
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
youtube_dl/extractor/npo.py
View file

@ -72,7 +72,7 @@ class NPOIE(NPOBaseIE):
'info_dict': { 'info_dict': {
'id': 'VARA_101191800', 'id': 'VARA_101191800',
'ext': 'm4v', 'ext': 'm4v',
'title': 'De Mega Mike & Mega Thomas show', 'title': 'De Mega Mike & Mega Thomas show: The best of.',
'description': 'md5:3b74c97fc9d6901d5a665aac0e5400f4', 'description': 'md5:3b74c97fc9d6901d5a665aac0e5400f4',
'upload_date': '20090227', 'upload_date': '20090227',
'duration': 2400, 'duration': 2400,
@ -84,7 +84,7 @@ class NPOIE(NPOBaseIE):
'info_dict': { 'info_dict': {
'id': 'VPWON_1169289', 'id': 'VPWON_1169289',
'ext': 'm4v', 'ext': 'm4v',
'title': 'Tegenlicht', 'title': 'Tegenlicht: De toekomst komt uit Afrika',
'description': 'md5:52cf4eefbc96fffcbdc06d024147abea', 'description': 'md5:52cf4eefbc96fffcbdc06d024147abea',
'upload_date': '20130225', 'upload_date': '20130225',
'duration': 3000, 'duration': 3000,
@ -157,6 +157,13 @@ class NPOIE(NPOBaseIE):
# video id is POMS_WNL_853698 but prid is POW_00996502) # video id is POMS_WNL_853698 but prid is POW_00996502)
video_id = metadata.get('prid') or video_id video_id = metadata.get('prid') or video_id
# titel is too generic in some cases so utilize aflevering_titel as well
# when available (e.g. http://tegenlicht.vpro.nl/afleveringen/2014-2015/access-to-africa.html)
title = metadata['titel']
sub_title = metadata.get('aflevering_titel')
if sub_title and sub_title != title:
title += ': %s' % sub_title
token = self._get_token(video_id) token = self._get_token(video_id)
formats = [] formats = []
@ -229,9 +236,7 @@ class NPOIE(NPOBaseIE):
return { return {
'id': video_id, 'id': video_id,
# prefer aflevering_titel if any since titel may be too generic, e.g. 'title': title,
# http://tegenlicht.vpro.nl/afleveringen/2014-2015/access-to-africa.html
'title': metadata.get('aflevering_titel') or metadata['titel'],
'description': metadata.get('info'), 'description': metadata.get('info'),
'thumbnail': metadata.get('images', [{'url': None}])[-1]['url'], 'thumbnail': metadata.get('images', [{'url': None}])[-1]['url'],
'upload_date': unified_strdate(metadata.get('gidsdatum')), 'upload_date': unified_strdate(metadata.get('gidsdatum')),