nogafam
/
youtube-dl
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

[vpro] Fix playlist title extraction and update tests

This commit is contained in:
Sergey M․ 2016-09-25 22:03:18 +07:00
parent a3d8b38168
commit ddb19772d5
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/extractor/npo.py
View File

@ -459,7 +459,7 @@ class NPOPlaylistBaseIE(NPOIE):
class VPROIE(NPOPlaylistBaseIE): class VPROIE(NPOPlaylistBaseIE):
IE_NAME = 'vpro' IE_NAME = 'vpro'
_VALID_URL = r'https?://(?:www\.)?(?:tegenlicht\.)?vpro\.nl/(?:[^/]+/){2,}(?P<id>[^/]+)\.html' _VALID_URL = r'https?://(?:www\.)?(?:tegenlicht\.)?vpro\.nl/(?:[^/]+/){2,}(?P<id>[^/]+)\.html'
_PLAYLIST_TITLE_RE = r'<title>\s*([^>]+?)\s*-\s*Teledoc\s*-\s*VPRO\s*</title>' _PLAYLIST_TITLE_RE = r'<h1[^>]+class=["\'].*?\bmedia-platform-title\b.*?["\'][^>]*>([^<]+)'
_PLAYLIST_ENTRY_RE = r'data-media-id="([^"]+)"' _PLAYLIST_ENTRY_RE = r'data-media-id="([^"]+)"'
_TESTS = [ _TESTS = [
@ -473,12 +473,13 @@ class VPROIE(NPOPlaylistBaseIE):
'description': 'md5:52cf4eefbc96fffcbdc06d024147abea', 'description': 'md5:52cf4eefbc96fffcbdc06d024147abea',
'upload_date': '20130225', 'upload_date': '20130225',
}, },
'skip': 'Video gone',
}, },
{ {
'url': 'http://www.vpro.nl/programmas/2doc/2015/sergio-herman.html', 'url': 'http://www.vpro.nl/programmas/2doc/2015/sergio-herman.html',
'info_dict': { 'info_dict': {
'id': 'sergio-herman', 'id': 'sergio-herman',
'title': 'Sergio Herman: Fucking perfect', 'title': 'sergio herman: fucking perfect',
}, },
'playlist_count': 2, 'playlist_count': 2,
}, },
@ -487,7 +488,7 @@ class VPROIE(NPOPlaylistBaseIE):
'url': 'http://www.vpro.nl/programmas/2doc/2015/education-education.html', 'url': 'http://www.vpro.nl/programmas/2doc/2015/education-education.html',
'info_dict': { 'info_dict': {
'id': 'education-education', 'id': 'education-education',
'title': '2Doc', 'title': 'education education',
}, },
'playlist_count': 2, 'playlist_count': 2,
} }