From: Sergey M․ <dstftw@gmail.com>
Date: Wed, 10 Feb 2016 14:46:38 +0000 (+0600)
Subject: [pbs] Switch to portal player by default (Closes #8491)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=7fcea295c59f3321c5a70cb8171e6d5de1f378e4;p=youtube-dl

[pbs] Switch to portal player by default (Closes #8491)
---

diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py
index 97e8ffc97..cbd1efea0 100644
--- a/youtube_dl/extractor/pbs.py
+++ b/youtube_dl/extractor/pbs.py
@@ -8,6 +8,7 @@ from ..utils import (
     ExtractorError,
     determine_ext,
     int_or_none,
+    js_to_json,
     strip_jsonp,
     unified_strdate,
     US_RATINGS,
@@ -432,9 +433,20 @@ class PBSIE(InfoExtractor):
                 for vid_id in video_id]
             return self.playlist_result(entries, display_id)
 
-        info = self._download_json(
-            'http://player.pbs.org/videoInfo/%s?format=json&type=partner' % video_id,
-            display_id)
+        player = self._download_webpage(
+            'http://player.pbs.org/portalplayer/%s' % video_id, display_id)
+
+        info = self._parse_json(
+            self._search_regex(
+                r'(?s)PBS\.videoData\s*=\s*({.+?});\n',
+                player, 'video data', default='{}'),
+            display_id, transform_source=js_to_json, fatal=False)
+
+        # Fallback to old videoInfo API
+        if not info:
+            info = self._download_json(
+                'http://player.pbs.org/videoInfo/%s?format=json&type=partner' % video_id,
+                display_id, 'Downloading video info JSON')
 
         formats = []
         for encoding_name in ('recommended_encoding', 'alternate_encoding'):