From: Sergey M․ <dstftw@gmail.com>
Date: Thu, 16 Jul 2015 18:53:12 +0000 (+0600)
Subject: [vpro] Improve playlist extraction
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=574f42d79a8596ceda681b205e19e766e7bab046;p=youtube-dl

[vpro] Improve playlist extraction
---

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)
         ]