aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-07-17 00:53:12 +0600
committerSergey M․ <dstftw@gmail.com>2015-07-17 00:53:12 +0600
commit574f42d79a8596ceda681b205e19e766e7bab046 (patch)
treee4576bcb58977a2d9d927f1b5261373fe9f5bceb /youtube_dl/extractor
parent536b0700b03f0b29a1025be0b7753253bd627d6b (diff)
[vpro] Improve playlist extraction
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/npo.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/youtube_dl/extractor/npo.py b/youtube_dl/extractor/npo.py
index e733d96f6..583ed3e14 100644
--- a/youtube_dl/extractor/npo.py
+++ b/youtube_dl/extractor/npo.py
@@ -428,6 +428,15 @@ class VPROIE(NPOIE):
'title': 'Sergio Herman: Fucking perfect',
},
'playlist_count': 2,
+ },
+ {
+ # playlist with youtube embed
+ 'url': 'http://www.vpro.nl/programmas/2doc/2015/education-education.html',
+ 'info_dict': {
+ 'id': 'education-education',
+ 'title': '2Doc',
+ },
+ 'playlist_count': 2,
}
]
@@ -437,7 +446,7 @@ class VPROIE(NPOIE):
webpage = self._download_webpage(url, playlist_id)
entries = [
- self.url_result('npo:%s' % video_id, 'NPO')
+ self.url_result('npo:%s' % video_id if not video_id.startswith('http') else video_id)
for video_id in re.findall(r'data-media-id="([^"]+)"', webpage)
]