From: Sergey M․ Date: Fri, 23 Jan 2015 16:54:29 +0000 (+0600) Subject: [atresplayer] Extract subtitles X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=0c17278843a30d4aea1f8334985e6fbae17000d9;p=youtube-dl [atresplayer] Extract subtitles --- diff --git a/youtube_dl/extractor/atresplayer.py b/youtube_dl/extractor/atresplayer.py index 8fd69b971..f42862be3 100644 --- a/youtube_dl/extractor/atresplayer.py +++ b/youtube_dl/extractor/atresplayer.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import time import hmac -from .common import InfoExtractor +from .subtitles import SubtitlesInfoExtractor from ..compat import ( compat_str, compat_urllib_parse, @@ -17,7 +17,7 @@ from ..utils import ( ) -class AtresPlayerIE(InfoExtractor): +class AtresPlayerIE(SubtitlesInfoExtractor): _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/television/[^/]+/[^/]+/[^/]+/(?P.+?)_\d+\.html' _TESTS = [ { @@ -143,6 +143,15 @@ class AtresPlayerIE(InfoExtractor): description = xpath_text(art, './description', 'description') thumbnail = xpath_text(episode, './media/asset/files/background', 'thumbnail') + subtitles = {} + subtitle = xpath_text(episode, './media/asset/files/subtitle', 'subtitle') + if subtitle: + subtitles['es'] = subtitle + + if self._downloader.params.get('listsubtitles', False): + self._list_available_subtitles(video_id, subtitles) + return + return { 'id': video_id, 'title': title, @@ -150,4 +159,5 @@ class AtresPlayerIE(InfoExtractor): 'thumbnail': thumbnail, 'duration': duration, 'formats': formats, + 'subtitles': self.extract_subtitles(video_id, subtitles), }