[bbc] Support multiple videos in articles embedded with playlist.sxml

This commit is contained in:
Sergey M․ 2015-10-10 20:40:56 +06:00
parent dab062fb6e
commit de66571371

View file

@ -660,23 +660,27 @@ def _real_extract(self, url):
r'itemprop="datePublished"[^>]+datetime="([^"]+)"'], r'itemprop="datePublished"[^>]+datetime="([^"]+)"'],
webpage, 'date', default=None)) webpage, 'date', default=None))
# single video with playlist.sxml URL (e.g. http://www.bbc.com/sport/0/football/3365340ng) # article with multiple videos embedded with playlist.sxml (e.g.
playlist = self._search_regex( # http://www.bbc.com/sport/0/football/34475836)
r'<param[^>]+name="playlist"[^>]+value="([^"]+)"', playlists = re.findall(r'<param[^>]+name="playlist"[^>]+value="([^"]+)"', webpage)
webpage, 'playlist', default=None) if playlists:
if playlist: entries = []
programme_id, title, description, duration, formats, subtitles = \ for playlist in playlists:
self._process_legacy_playlist_url(playlist, playlist_id) programme_id, title, description, duration, formats, subtitles = \
self._sort_formats(formats) self._process_legacy_playlist_url(playlist, playlist_id)
return { self._sort_formats(formats)
'id': programme_id, entries.append({
'title': title, 'id': programme_id,
'description': description, 'title': title,
'duration': duration, 'description': description,
'timestamp': timestamp, 'duration': duration,
'formats': formats, 'timestamp': timestamp,
'subtitles': subtitles, 'formats': formats,
} 'subtitles': subtitles,
})
playlist_title = self._og_search_title(webpage)
playlist_description = self._og_search_description(webpage)
return self.playlist_result(entries, playlist_id, playlist_title, playlist_description)
# single video story (e.g. http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret) # single video story (e.g. http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret)
programme_id = self._search_regex( programme_id = self._search_regex(