mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-03 23:17:07 -05:00 
			
		
		
		
	[pbs] Switch to portal player by default (Closes #8491)
This commit is contained in:
		@@ -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'):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user