youtube_dl/extractor/npo.py

@@ -11,7 +11,7 @@ from ..utils import ExtractorError
 class NPOIE(InfoExtractor):
     IE_NAME = 'npo'
     IE_DESC = 'npo.nl'
-    _VALID_URL = r'https?://(?:www\.)?npo\.nl/start/serie/'
+    _VALID_URL = r'https?://(?:www\.)?npo\.nl/.*'
 
     _TESTS = [{
         'url': 'https://npo.nl/start/serie/zembla/seizoen-2015/wie-is-de-mol-2/',
@@ -55,7 +55,8 @@ class NPOIE(InfoExtractor):
         slug = url.split('/')[-1]
 
         program_metadata = self._download_json('https://npo.nl/start/api/domain/program-detail',
-                                               slug, query={'slug': slug})
+                                               slug,
+                                               query={'slug': slug})
         product_id = program_metadata.get('productId')
         images = program_metadata.get('images')
         thumbnail = None
@@ -306,7 +307,7 @@ class VPROIE(NPOIE):
     def _real_extract(self, url):
         video_id = url.rstrip('/').split('/')[-1]
         page, _ = self._download_webpage_handle(url, video_id)
-        results = re.findall(r'data-media-id="([a-zA-Z0-9_]+)"\s', page)
+        results = re.findall(r'data-media-id="(.+_.+)"\s', page)
         formats = []
         for result in results:
             formats.extend(self._extract_formats_by_product_id(result, video_id))