diff options
Diffstat (limited to 'youtube_dl/extractor/revision3.py')
| -rw-r--r-- | youtube_dl/extractor/revision3.py | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/youtube_dl/extractor/revision3.py b/youtube_dl/extractor/revision3.py index 25fe4ef16..b1b8800b9 100644 --- a/youtube_dl/extractor/revision3.py +++ b/youtube_dl/extractor/revision3.py @@ -9,6 +9,7 @@ from ..utils import ( int_or_none, parse_iso8601, unescapeHTML, + qualities, ) @@ -19,12 +20,15 @@ class Revision3IE(InfoExtractor): 'md5': 'd94a72d85d0a829766de4deb8daaf7df', 'info_dict': { 'id': '73034', + 'display_id': 'technobuffalo/5-google-predictions-for-2016', 'ext': 'webm', 'title': '5 Google Predictions for 2016', 'description': 'Google had a great 2015, but it\'s already time to look ahead. Here are our five predictions for 2016.', 'upload_date': '20151228', 'timestamp': 1451325600, 'duration': 187, + 'uploader': 'TechnoBuffalo', + 'uploader_id': 'technobuffalo', } }, { 'url': 'http://testtube.com/brainstuff', @@ -34,6 +38,20 @@ class Revision3IE(InfoExtractor): 'description': 'Whether the topic is popcorn or particle physics, you can count on the HowStuffWorks team to explore-and explain-the everyday science in the world around us on BrainStuff.', }, 'playlist_mincount': 93, + }, { + 'url': 'https://testtube.com/dnews/5-weird-ways-plants-can-eat-animals?utm_source=FB&utm_medium=DNews&utm_campaign=DNewsSocial', + 'info_dict': { + 'id': '60163', + 'display_id': 'dnews/5-weird-ways-plants-can-eat-animals', + 'duration': 275, + 'ext': 'webm', + 'title': '5 Weird Ways Plants Can Eat Animals', + 'description': 'Why have some plants evolved to eat meat?', + 'upload_date': '20150120', + 'timestamp': 1421763300, + 'uploader': 'DNews', + 'uploader_id': 'dnews', + }, }] _PAGE_DATA_TEMPLATE = 'http://www.%s/apiProxy/ddn/%s?domain=%s' _API_KEY = 'ba9c741bce1b9d8e3defcc22193f3651b8867e62' @@ -51,7 +69,7 @@ class Revision3IE(InfoExtractor): video_id)['items'][0] formats = [] - for media_type, media in video_data['media'].items(): + for vcodec, media in video_data['media'].items(): for quality_id, quality in media.items(): if quality_id == 'hls': formats.extend(self._extract_m3u8_formats( @@ -60,22 +78,28 @@ class Revision3IE(InfoExtractor): else: formats.append({ 'url': quality['url'], - 'format_id': '%s-%s' % (media_type, quality_id), + 'format_id': '%s-%s' % (vcodec, quality_id), 'tbr': int_or_none(quality.get('bitrate')), + 'vcodec': vcodec, }) self._sort_formats(formats) + preference = qualities(['mini', 'small', 'medium', 'large']) thumbnails = [{ 'url': image_url, 'id': image_id, + 'preference': preference(image_id) } for image_id, image_url in video_data.get('images', {}).items()] return { 'id': video_id, + 'display_id': display_id, 'title': unescapeHTML(video_data['title']), 'description': unescapeHTML(video_data.get('summary')), 'timestamp': parse_iso8601(episode_data.get('publishTime'), ' '), 'author': episode_data.get('author'), + 'uploader': video_data.get('show', {}).get('name'), + 'uploader_id': video_data.get('show', {}).get('slug'), 'duration': int_or_none(video_data.get('duration')), 'thumbnails': thumbnails, 'formats': formats, @@ -89,7 +113,7 @@ class Revision3IE(InfoExtractor): page_num = 1 while True: entries.extend([self.url_result( - url + '/%s' % episode['slug']) for episode in episodes_data]) + 'http://%s/%s/%s' % (domain, display_id, episode['slug'])) for episode in episodes_data]) processed_episodes += len(episodes_data) if processed_episodes == num_episodes: break |