projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1540119
)
[npo] Compound title
author
Sergey M․
<dstftw@gmail.com>
Thu, 16 Jul 2015 19:28:52 +0000
(
01:28
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 16 Jul 2015 19:28:52 +0000
(
01:28
+0600)
youtube_dl/extractor/npo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/npo.py
b/youtube_dl/extractor/npo.py
index f5ffe12318eec8120a00acba2673c65948e6209b..0c2d02c108ed425cf4688c34aa2a826ddaa400b4 100644
(file)
--- a/
youtube_dl/extractor/npo.py
+++ b/
youtube_dl/extractor/npo.py
@@
-72,7
+72,7
@@
class NPOIE(NPOBaseIE):
'info_dict': {
'id': 'VARA_101191800',
'ext': 'm4v',
'info_dict': {
'id': 'VARA_101191800',
'ext': 'm4v',
- 'title': 'De Mega Mike & Mega Thomas show',
+ 'title': 'De Mega Mike & Mega Thomas show
: The best of.
',
'description': 'md5:3b74c97fc9d6901d5a665aac0e5400f4',
'upload_date': '20090227',
'duration': 2400,
'description': 'md5:3b74c97fc9d6901d5a665aac0e5400f4',
'upload_date': '20090227',
'duration': 2400,
@@
-84,7
+84,7
@@
class NPOIE(NPOBaseIE):
'info_dict': {
'id': 'VPWON_1169289',
'ext': 'm4v',
'info_dict': {
'id': 'VPWON_1169289',
'ext': 'm4v',
- 'title': 'Tegenlicht',
+ 'title': 'Tegenlicht
: De toekomst komt uit Afrika
',
'description': 'md5:52cf4eefbc96fffcbdc06d024147abea',
'upload_date': '20130225',
'duration': 3000,
'description': 'md5:52cf4eefbc96fffcbdc06d024147abea',
'upload_date': '20130225',
'duration': 3000,
@@
-157,6
+157,13
@@
class NPOIE(NPOBaseIE):
# video id is POMS_WNL_853698 but prid is POW_00996502)
video_id = metadata.get('prid') or video_id
# video id is POMS_WNL_853698 but prid is POW_00996502)
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)
formats = []
token = self._get_token(video_id)
formats = []
@@
-229,9
+236,7
@@
class NPOIE(NPOBaseIE):
return {
'id': video_id,
return {
'id': video_id,
- # prefer aflevering_titel if any since titel may be too generic, e.g.
- # http://tegenlicht.vpro.nl/afleveringen/2014-2015/access-to-africa.html
- 'title': metadata.get('aflevering_titel') or metadata['titel'],
+ 'title': title,
'description': metadata.get('info'),
'thumbnail': metadata.get('images', [{'url': None}])[-1]['url'],
'upload_date': unified_strdate(metadata.get('gidsdatum')),
'description': metadata.get('info'),
'thumbnail': metadata.get('images', [{'url': None}])[-1]['url'],
'upload_date': unified_strdate(metadata.get('gidsdatum')),