[bbccouk] Switch to new JSON playlist format (Closes #4588)

pull/4596/head
Sergey M․ 10 years ago
parent e8e28989eb
commit ae6986fb89

@ -71,7 +71,20 @@ class BBCCoUkIE(SubtitlesInfoExtractor):
'skip_download': True, 'skip_download': True,
}, },
'skip': 'Currently BBC iPlayer TV programmes are available to play in the UK only', 'skip': 'Currently BBC iPlayer TV programmes are available to play in the UK only',
}, {
'url': 'http://www.bbc.co.uk/programmes/b04v20dw',
'info_dict': {
'id': 'b04v209v',
'ext': 'flv',
'title': 'Pete Tong, The Essential New Tune Special',
'description': "Pete has a very special mix - all of 2014's Essential New Tunes!",
'duration': 10800,
}, },
'params': {
# rtmp download
'skip_download': True,
}
}
] ]
def _extract_asx_playlist(self, connection, programme_id): def _extract_asx_playlist(self, connection, programme_id):
@ -203,37 +216,45 @@ class BBCCoUkIE(SubtitlesInfoExtractor):
return formats, subtitles return formats, subtitles
def _real_extract(self, url): def _download_playlist(self, playlist_id):
group_id = self._match_id(url) try:
playlist = self._download_json(
webpage = self._download_webpage(url, group_id, 'Downloading video page') 'http://www.bbc.co.uk/programmes/%s/playlist.json' % playlist_id,
playlist_id, 'Downloading playlist JSON')
programme_id = self._search_regex( version = playlist.get('defaultAvailableVersion')
r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False, default=None) if version:
if programme_id: smp_config = version['smpConfig']
player = self._download_json( title = smp_config['title']
'http://www.bbc.co.uk/iplayer/episode/%s.json' % group_id, description = smp_config['summary']
group_id)['jsConf']['player'] for item in smp_config['items']:
title = player['title'] kind = item['kind']
description = player['subtitle'] if kind != 'programme' and kind != 'radioProgramme':
duration = player['duration'] continue
programme_id = item.get('vpid')
duration = int(item.get('duration'))
formats, subtitles = self._download_media_selector(programme_id) formats, subtitles = self._download_media_selector(programme_id)
else: return programme_id, title, description, duration, formats, subtitles
except ExtractorError as ee:
if not isinstance(ee.cause, compat_HTTPError) and ee.cause.code == 404:
raise
# fallback to legacy playlist
playlist = self._download_xml( playlist = self._download_xml(
'http://www.bbc.co.uk/iplayer/playlist/%s' % group_id, 'http://www.bbc.co.uk/iplayer/playlist/%s' % playlist_id,
group_id, 'Downloading playlist XML') playlist_id, 'Downloading legacy playlist XML')
no_items = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}noItems') no_items = playlist.find('./{http://bbc.co.uk/2008/emp/playlist}noItems')
if no_items is not None: if no_items is not None:
reason = no_items.get('reason') reason = no_items.get('reason')
if reason == 'preAvailability': if reason == 'preAvailability':
msg = 'Episode %s is not yet available' % group_id msg = 'Episode %s is not yet available' % playlist_id
elif reason == 'postAvailability': elif reason == 'postAvailability':
msg = 'Episode %s is no longer available' % group_id msg = 'Episode %s is no longer available' % playlist_id
elif reason == 'noMedia': elif reason == 'noMedia':
msg = 'Episode %s is not currently available' % group_id msg = 'Episode %s is not currently available' % playlist_id
else: else:
msg = 'Episode %s is not available: %s' % (group_id, reason) msg = 'Episode %s is not available: %s' % (playlist_id, reason)
raise ExtractorError(msg, expected=True) raise ExtractorError(msg, expected=True)
for item in self._extract_items(playlist): for item in self._extract_items(playlist):
@ -246,6 +267,26 @@ class BBCCoUkIE(SubtitlesInfoExtractor):
duration = int(item.get('duration')) duration = int(item.get('duration'))
formats, subtitles = self._download_media_selector(programme_id) formats, subtitles = self._download_media_selector(programme_id)
return programme_id, title, description, duration, formats, subtitles
def _real_extract(self, url):
group_id = self._match_id(url)
webpage = self._download_webpage(url, group_id, 'Downloading video page')
programme_id = self._search_regex(
r'"vpid"\s*:\s*"([\da-z]{8})"', webpage, 'vpid', fatal=False, default=None)
if programme_id:
player = self._download_json(
'http://www.bbc.co.uk/iplayer/episode/%s.json' % group_id,
group_id)['jsConf']['player']
title = player['title']
description = player['subtitle']
duration = player['duration']
formats, subtitles = self._download_media_selector(programme_id)
else:
programme_id, title, description, duration, formats, subtitles = self._download_playlist(group_id)
if self._downloader.params.get('listsubtitles', False): if self._downloader.params.get('listsubtitles', False):
self._list_available_subtitles(programme_id, subtitles) self._list_available_subtitles(programme_id, subtitles)
return return

Loading…
Cancel
Save