Upstream/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-11 14:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

[9Now] handle episodes of series (#896)

Browse Source 
Authored by: dalanmiller
This commit is contained in:
dalan 2021-09-12 22:11:24 +10:00 committed by GitHub
parent 0fd6661edb
commit 03c862794f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
yt_dlp/extractor/ninenow.py
View File

@ -8,6 +8,10 @@
int_or_none, int_or_none,
float_or_none, float_or_none,
smuggle_url, smuggle_url,
str_or_none,
try_get,
unified_strdate,
unified_timestamp,
) )
@ -37,6 +41,24 @@ class NineNowIE(InfoExtractor):
# DRM protected # DRM protected
'url': 'https://www.9now.com.au/andrew-marrs-history-of-the-world/season-1/episode-1', 'url': 'https://www.9now.com.au/andrew-marrs-history-of-the-world/season-1/episode-1',
'only_matching': True, 'only_matching': True,
}, {
# episode of series
'url': 'https://www.9now.com.au/lego-masters/season-3/episode-3',
'info_dict': {
'id': '6249614030001',
'title': 'Episode 3',
'ext': 'mp4',
'season_number': 3,
'episode_number': 3,
'description': 'In the first elimination of the competition, teams will have 10 hours to build a world inside a snow globe.',
'uploader_id': '4460760524001',
'timestamp': 1619002200,
'upload_date': '20210421',
},
'expected_warnings': ['Ignoring subtitle tracks'],
'params':{
'skip_download': True,
}
}] }]
BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId=%s' BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId=%s'
@ -59,26 +81,31 @@ def _real_extract(self, url):
cache = page_data.get(kind, {}).get('%sCache' % kind, {}) cache = page_data.get(kind, {}).get('%sCache' % kind, {})
if not cache: if not cache:
continue continue
common_data = (cache.get(current_key) or list(cache.values())[0])[kind] common_data = {
'episode': (cache.get(current_key) or list(cache.values())[0])[kind],
'season': (cache.get(current_key) or list(cache.values())[0]).get('season', None)
}
break break
else: else:
raise ExtractorError('Unable to find video data') raise ExtractorError('Unable to find video data')
video_data = common_data['video'] if not self.get_param('allow_unplayable_formats') and try_get(common_data, lambda x: x['episode']['video']['drm'], bool):
self.report_drm(display_id)
brightcove_id = video_data.get('brightcoveId') or 'ref:' + video_data['referenceId'] brightcove_id = try_get(
video_id = compat_str(video_data.get('id') or brightcove_id) common_data, lambda x: x['episode']['video']['brightcoveId'], compat_str) or 'ref:%s' % common_data['episode']['video']['referenceId']
video_id = str_or_none(try_get(common_data, lambda x: x['episode']['video']['id'])) or brightcove_id
if not self.get_param('allow_unplayable_formats') and video_data.get('drm'):
self.report_drm(video_id)
title = common_data['name']
title = try_get(common_data, lambda x: x['episode']['name'], compat_str)
season_number = try_get(common_data, lambda x: x['season']['seasonNumber'], int)
episode_number = try_get(common_data, lambda x: x['episode']['episodeNumber'], int)
timestamp = unified_timestamp(try_get(common_data, lambda x: x['episode']['airDate'], compat_str))
release_date = unified_strdate(try_get(common_data, lambda x: x['episode']['availability'], compat_str))
thumbnails_data = try_get(common_data, lambda x: x['episode']['image']['sizes'], dict) or {}
thumbnails = [{ thumbnails = [{
'id': thumbnail_id, 'id': thumbnail_id,
'url': thumbnail_url, 'url': thumbnail_url,
'width': int_or_none(thumbnail_id[1:]) 'width': int_or_none(thumbnail_id[1:]),
} for thumbnail_id, thumbnail_url in common_data.get('image', {}).get('sizes', {}).items()] } for thumbnail_id, thumbnail_url in thumbnails_data.items()]
return { return {
'_type': 'url_transparent', '_type': 'url_transparent',
@ -87,8 +114,12 @@ def _real_extract(self, url):
{'geo_countries': self._GEO_COUNTRIES}), {'geo_countries': self._GEO_COUNTRIES}),
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'description': common_data.get('description'), 'description': try_get(common_data, lambda x: x['episode']['description'], compat_str),
'duration': float_or_none(video_data.get('duration'), 1000), 'duration': float_or_none(try_get(common_data, lambda x: x['episode']['video']['duration'], float), 1000),
'thumbnails': thumbnails, 'thumbnails': thumbnails,
'ie_key': 'BrightcoveNew', 'ie_key': 'BrightcoveNew',
'season_number': season_number,
'episode_number': episode_number,
'timestamp': timestamp,
'release_date': release_date,
} }