mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 07:17:07 -05:00 
			
		
		
		
	[npo] Add support for streams (Closes #4276)
This commit is contained in:
		@@ -9,6 +9,7 @@ from ..utils import (
 | 
			
		||||
    qualities,
 | 
			
		||||
    strip_jsonp,
 | 
			
		||||
    url_basename,
 | 
			
		||||
    fix_xml_ampersands,
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -51,7 +52,21 @@ class NPOIE(InfoExtractor):
 | 
			
		||||
                'upload_date': '20130225',
 | 
			
		||||
                'duration': 3000,
 | 
			
		||||
            },
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            'url': 'http://www.npo.nl/de-nieuwe-mens-deel-1/21-07-2010/WO_VPRO_043706',
 | 
			
		||||
            'info_dict': {
 | 
			
		||||
                'id': 'WO_VPRO_043706',
 | 
			
		||||
                'ext': 'wmv',
 | 
			
		||||
                'title': 'De nieuwe mens - Deel 1',
 | 
			
		||||
                'description': 'md5:518ae51ba1293ffb80d8d8ce90b74e4b',
 | 
			
		||||
                'duration': 4680,
 | 
			
		||||
            },
 | 
			
		||||
            'params': {
 | 
			
		||||
                # mplayer mms download
 | 
			
		||||
                'skip_download': True,
 | 
			
		||||
            }
 | 
			
		||||
        },
 | 
			
		||||
    ]
 | 
			
		||||
 | 
			
		||||
    def _real_extract(self, url):
 | 
			
		||||
@@ -74,10 +89,14 @@ class NPOIE(InfoExtractor):
 | 
			
		||||
        token = self._search_regex(r'npoplayer\.token = "(.+?)"', token_page, 'token')
 | 
			
		||||
 | 
			
		||||
        formats = []
 | 
			
		||||
 | 
			
		||||
        pubopties = metadata.get('pubopties')
 | 
			
		||||
        if pubopties:
 | 
			
		||||
            quality = qualities(['adaptive', 'wmv_sb', 'h264_sb', 'wmv_bb', 'h264_bb', 'wvc1_std', 'h264_std'])
 | 
			
		||||
        for format_id in metadata['pubopties']:
 | 
			
		||||
            for format_id in pubopties:
 | 
			
		||||
                format_info = self._download_json(
 | 
			
		||||
                'http://ida.omroep.nl/odi/?prid=%s&puboptions=%s&adaptive=yes&token=%s' % (video_id, format_id, token),
 | 
			
		||||
                    'http://ida.omroep.nl/odi/?prid=%s&puboptions=%s&adaptive=yes&token=%s'
 | 
			
		||||
                    % (video_id, format_id, token),
 | 
			
		||||
                    video_id, 'Downloading %s JSON' % format_id)
 | 
			
		||||
                if format_info.get('error_code', 0) or format_info.get('errorcode', 0):
 | 
			
		||||
                    continue
 | 
			
		||||
@@ -99,6 +118,29 @@ class NPOIE(InfoExtractor):
 | 
			
		||||
                        'format_id': format_id,
 | 
			
		||||
                        'quality': quality(format_id),
 | 
			
		||||
                    })
 | 
			
		||||
 | 
			
		||||
        streams = metadata.get('streams')
 | 
			
		||||
        if streams:
 | 
			
		||||
            for i, stream in enumerate(streams):
 | 
			
		||||
                stream_url = stream.get('url')
 | 
			
		||||
                if not stream_url:
 | 
			
		||||
                    continue
 | 
			
		||||
                asx = self._download_xml(
 | 
			
		||||
                    stream_url, video_id,
 | 
			
		||||
                    'Downloading stream %d ASX playlist' % i,
 | 
			
		||||
                    transform_source=fix_xml_ampersands)
 | 
			
		||||
                ref = asx.find('./ENTRY/Ref')
 | 
			
		||||
                if ref is None:
 | 
			
		||||
                    continue
 | 
			
		||||
                video_url = ref.get('href')
 | 
			
		||||
                if not video_url:
 | 
			
		||||
                    continue
 | 
			
		||||
                formats.append({
 | 
			
		||||
                    'url': video_url,
 | 
			
		||||
                    'ext': stream.get('formaat', 'asf'),
 | 
			
		||||
                    'quality': stream.get('kwaliteit'),
 | 
			
		||||
                })
 | 
			
		||||
 | 
			
		||||
        self._sort_formats(formats)
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user