mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 00:37:06 -05:00 
			
		
		
		
	[cwtv] fix extraction(closes #17256)
This commit is contained in:
		@@ -4,7 +4,10 @@ from __future__ import unicode_literals
 | 
				
			|||||||
from .common import InfoExtractor
 | 
					from .common import InfoExtractor
 | 
				
			||||||
from ..utils import (
 | 
					from ..utils import (
 | 
				
			||||||
    int_or_none,
 | 
					    int_or_none,
 | 
				
			||||||
 | 
					    parse_age_limit,
 | 
				
			||||||
    parse_iso8601,
 | 
					    parse_iso8601,
 | 
				
			||||||
 | 
					    smuggle_url,
 | 
				
			||||||
 | 
					    str_or_none,
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -40,10 +43,15 @@ class CWTVIE(InfoExtractor):
 | 
				
			|||||||
            'duration': 1263,
 | 
					            'duration': 1263,
 | 
				
			||||||
            'series': 'Whose Line Is It Anyway?',
 | 
					            'series': 'Whose Line Is It Anyway?',
 | 
				
			||||||
            'season_number': 11,
 | 
					            'season_number': 11,
 | 
				
			||||||
            'season': '11',
 | 
					 | 
				
			||||||
            'episode_number': 20,
 | 
					            'episode_number': 20,
 | 
				
			||||||
            'upload_date': '20151006',
 | 
					            'upload_date': '20151006',
 | 
				
			||||||
            'timestamp': 1444107300,
 | 
					            'timestamp': 1444107300,
 | 
				
			||||||
 | 
					            'age_limit': 14,
 | 
				
			||||||
 | 
					            'uploader': 'CWTV',
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        'params': {
 | 
				
			||||||
 | 
					            # m3u8 download
 | 
				
			||||||
 | 
					            'skip_download': True,
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
    }, {
 | 
					    }, {
 | 
				
			||||||
        'url': 'http://cwtv.com/thecw/chroniclesofcisco/?play=8adebe35-f447-465f-ab52-e863506ff6d6',
 | 
					        'url': 'http://cwtv.com/thecw/chroniclesofcisco/?play=8adebe35-f447-465f-ab52-e863506ff6d6',
 | 
				
			||||||
@@ -58,60 +66,28 @@ class CWTVIE(InfoExtractor):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def _real_extract(self, url):
 | 
					    def _real_extract(self, url):
 | 
				
			||||||
        video_id = self._match_id(url)
 | 
					        video_id = self._match_id(url)
 | 
				
			||||||
        video_data = None
 | 
					        video_data = self._download_json(
 | 
				
			||||||
        formats = []
 | 
					            'http://images.cwtv.com/feed/mobileapp/video-meta/apiversion_8/guid_' + video_id,
 | 
				
			||||||
        for partner in (154, 213):
 | 
					            video_id)['video']
 | 
				
			||||||
            vdata = self._download_json(
 | 
					        title = video_data['title']
 | 
				
			||||||
                'http://metaframe.digitalsmiths.tv/v2/CWtv/assets/%s/partner/%d?format=json' % (video_id, partner), video_id, fatal=False)
 | 
					        mpx_url = video_data.get('mpx_url') or 'http://link.theplatform.com/s/cwtv/media/guid/2703454149/%s?formats=M3U' % video_id
 | 
				
			||||||
            if not vdata:
 | 
					 | 
				
			||||||
                continue
 | 
					 | 
				
			||||||
            video_data = vdata
 | 
					 | 
				
			||||||
            for quality, quality_data in vdata.get('videos', {}).items():
 | 
					 | 
				
			||||||
                quality_url = quality_data.get('uri')
 | 
					 | 
				
			||||||
                if not quality_url:
 | 
					 | 
				
			||||||
                    continue
 | 
					 | 
				
			||||||
                if quality == 'variantplaylist':
 | 
					 | 
				
			||||||
                    formats.extend(self._extract_m3u8_formats(
 | 
					 | 
				
			||||||
                        quality_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
 | 
					 | 
				
			||||||
                else:
 | 
					 | 
				
			||||||
                    tbr = int_or_none(quality_data.get('bitrate'))
 | 
					 | 
				
			||||||
                    format_id = 'http' + ('-%d' % tbr if tbr else '')
 | 
					 | 
				
			||||||
                    if self._is_valid_url(quality_url, video_id, format_id):
 | 
					 | 
				
			||||||
                        formats.append({
 | 
					 | 
				
			||||||
                            'format_id': format_id,
 | 
					 | 
				
			||||||
                            'url': quality_url,
 | 
					 | 
				
			||||||
                            'tbr': tbr,
 | 
					 | 
				
			||||||
                        })
 | 
					 | 
				
			||||||
        video_metadata = video_data['assetFields']
 | 
					 | 
				
			||||||
        ism_url = video_metadata.get('smoothStreamingUrl')
 | 
					 | 
				
			||||||
        if ism_url:
 | 
					 | 
				
			||||||
            formats.extend(self._extract_ism_formats(
 | 
					 | 
				
			||||||
                ism_url, video_id, ism_id='mss', fatal=False))
 | 
					 | 
				
			||||||
        self._sort_formats(formats)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        thumbnails = [{
 | 
					        season = str_or_none(video_data.get('season'))
 | 
				
			||||||
            'url': image['uri'],
 | 
					        episode = str_or_none(video_data.get('episode'))
 | 
				
			||||||
            'width': image.get('width'),
 | 
					        if episode and season:
 | 
				
			||||||
            'height': image.get('height'),
 | 
					            episode = episode.lstrip(season)
 | 
				
			||||||
        } for image_id, image in video_data['images'].items() if image.get('uri')] if video_data.get('images') else None
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        subtitles = {
 | 
					 | 
				
			||||||
            'en': [{
 | 
					 | 
				
			||||||
                'url': video_metadata['UnicornCcUrl'],
 | 
					 | 
				
			||||||
            }],
 | 
					 | 
				
			||||||
        } if video_metadata.get('UnicornCcUrl') else None
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return {
 | 
					        return {
 | 
				
			||||||
 | 
					            '_type': 'url_transparent',
 | 
				
			||||||
            'id': video_id,
 | 
					            'id': video_id,
 | 
				
			||||||
            'title': video_metadata['title'],
 | 
					            'title': title,
 | 
				
			||||||
            'description': video_metadata.get('description'),
 | 
					            'url': smuggle_url(mpx_url, {'force_smil_url': True}),
 | 
				
			||||||
            'duration': int_or_none(video_metadata.get('duration')),
 | 
					            'description': video_data.get('description_long'),
 | 
				
			||||||
            'series': video_metadata.get('seriesName'),
 | 
					            'duration': int_or_none(video_data.get('duration_secs')),
 | 
				
			||||||
            'season_number': int_or_none(video_metadata.get('seasonNumber')),
 | 
					            'series': video_data.get('series_name'),
 | 
				
			||||||
            'season': video_metadata.get('seasonName'),
 | 
					            'season_number': int_or_none(season),
 | 
				
			||||||
            'episode_number': int_or_none(video_metadata.get('episodeNumber')),
 | 
					            'episode_number': int_or_none(episode),
 | 
				
			||||||
            'timestamp': parse_iso8601(video_data.get('startTime')),
 | 
					            'timestamp': parse_iso8601(video_data.get('start_time')),
 | 
				
			||||||
            'thumbnails': thumbnails,
 | 
					            'age_limit': parse_age_limit(video_data.get('rating')),
 | 
				
			||||||
            'formats': formats,
 | 
					            'ie_key': 'ThePlatform',
 | 
				
			||||||
            'subtitles': subtitles,
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user