[adobetv] use api for extraction and add support specific language videos
This commit is contained in:
		| @@ -1,23 +1,26 @@ | ||||
| from __future__ import unicode_literals | ||||
|  | ||||
| import re | ||||
|  | ||||
| from .common import InfoExtractor | ||||
| from ..utils import ( | ||||
|     parse_duration, | ||||
|     unified_strdate, | ||||
|     str_to_int, | ||||
|     int_or_none, | ||||
|     float_or_none, | ||||
|     ISO639Utils, | ||||
| ) | ||||
|  | ||||
|  | ||||
| class AdobeTVIE(InfoExtractor): | ||||
|     _VALID_URL = r'https?://tv\.adobe\.com/watch/[^/]+/(?P<id>[^/]+)' | ||||
|     _VALID_URL = r'https?://tv\.adobe\.com/(?:(?P<language>fr|de|es|jp)/)?watch/(?P<show_urlname>[^/]+)/(?P<id>[^/]+)' | ||||
|  | ||||
|     _TEST = { | ||||
|         'url': 'http://tv.adobe.com/watch/the-complete-picture-with-julieanne-kost/quick-tip-how-to-draw-a-circle-around-an-object-in-photoshop/', | ||||
|         'md5': '9bc5727bcdd55251f35ad311ca74fa1e', | ||||
|         'info_dict': { | ||||
|             'id': 'quick-tip-how-to-draw-a-circle-around-an-object-in-photoshop', | ||||
|             'id': '10981', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Quick Tip - How to Draw a Circle Around an Object in Photoshop', | ||||
|             'description': 'md5:99ec318dc909d7ba2a1f2b038f7d2311', | ||||
| @@ -29,46 +32,31 @@ class AdobeTVIE(InfoExtractor): | ||||
|     } | ||||
|  | ||||
|     def _real_extract(self, url): | ||||
|         video_id = self._match_id(url) | ||||
|         webpage = self._download_webpage(url, video_id) | ||||
|         language, show_urlname, urlname = re.match(self._VALID_URL, url).groups() | ||||
|         if not language: | ||||
|             language = 'en' | ||||
|  | ||||
|         player = self._parse_json( | ||||
|             self._search_regex(r'html5player:\s*({.+?})\s*\n', webpage, 'player'), | ||||
|             video_id) | ||||
|  | ||||
|         title = player.get('title') or self._search_regex( | ||||
|             r'data-title="([^"]+)"', webpage, 'title') | ||||
|         description = self._og_search_description(webpage) | ||||
|         thumbnail = self._og_search_thumbnail(webpage) | ||||
|  | ||||
|         upload_date = unified_strdate( | ||||
|             self._html_search_meta('datepublished', webpage, 'upload date')) | ||||
|  | ||||
|         duration = parse_duration( | ||||
|             self._html_search_meta('duration', webpage, 'duration') or | ||||
|             self._search_regex( | ||||
|                 r'Runtime:\s*(\d{2}:\d{2}:\d{2})', | ||||
|                 webpage, 'duration', fatal=False)) | ||||
|  | ||||
|         view_count = str_to_int(self._search_regex( | ||||
|             r'<div class="views">\s*Views?:\s*([\d,.]+)\s*</div>', | ||||
|             webpage, 'view count')) | ||||
|         video_data = self._download_json( | ||||
|             'http://tv.adobe.com/api/v4/episode/get/?language=%s&show_urlname=%s&urlname=%s&disclosure=standard' % (language, show_urlname, urlname), | ||||
|             urlname)['data'][0] | ||||
|  | ||||
|         formats = [{ | ||||
|             'url': source['src'], | ||||
|             'format_id': source.get('quality') or source['src'].split('-')[-1].split('.')[0] or None, | ||||
|             'tbr': source.get('bitrate'), | ||||
|         } for source in player['sources']] | ||||
|             'url': source['url'], | ||||
|             'format_id': source.get('quality_level') or source['url'].split('-')[-1].split('.')[0] or None, | ||||
|             'width': int_or_none(source.get('width')), | ||||
|             'height': int_or_none(source.get('height')), | ||||
|             'tbr': int_or_none(source.get('video_data_rate')), | ||||
|         } for source in video_data['videos']] | ||||
|         self._sort_formats(formats) | ||||
|  | ||||
|         return { | ||||
|             'id': video_id, | ||||
|             'title': title, | ||||
|             'description': description, | ||||
|             'thumbnail': thumbnail, | ||||
|             'upload_date': upload_date, | ||||
|             'duration': duration, | ||||
|             'view_count': view_count, | ||||
|             'id': str(video_data['id']), | ||||
|             'title': video_data['title'], | ||||
|             'description': video_data.get('description'), | ||||
|             'thumbnail': video_data.get('thumbnail'), | ||||
|             'upload_date': unified_strdate(video_data.get('start_date')), | ||||
|             'duration': parse_duration(video_data.get('duration')), | ||||
|             'view_count': str_to_int(video_data.get('playcount')), | ||||
|             'formats': formats, | ||||
|         } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user