From: Jaime Marquínez Ferrándiz Date: Sun, 15 Mar 2015 21:17:40 +0000 (+0100) Subject: [rtve.es:infantil] Minor fixes (closes #5214) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=b68eedba23cbb4cc419e3568055bfb86c5975054;p=youtube-dl [rtve.es:infantil] Minor fixes (closes #5214) --- diff --git a/youtube_dl/extractor/rtve.py b/youtube_dl/extractor/rtve.py index b701a322a..13f071077 100644 --- a/youtube_dl/extractor/rtve.py +++ b/youtube_dl/extractor/rtve.py @@ -126,10 +126,11 @@ class RTVEALaCartaIE(InfoExtractor): (s['lang'], [{'ext': 'vtt', 'url': s['src']}]) for s in subs) + class RTVEInfantilIE(InfoExtractor): - IE_NAME = 'rtve.es:alacarta' - IE_DESC = 'RTVE a la carta' - _VALID_URL = r'https?://(?:www\.)?rtve\.es/infantil/serie/(?P[^/]*)/video/(?P[^/]*)/(?P[0-9]+)/' + IE_NAME = 'rtve.es:infantil' + IE_DESC = 'RTVE infantil' + _VALID_URL = r'https?://(?:www\.)?rtve\.es/infantil/serie/(?P[^/]*)/video/(?P[^/]*)/(?P[0-9]+)/' _TESTS = [{ 'url': 'http://www.rtve.es/infantil/serie/cleo/video/maneras-vivir/3040283/', @@ -141,12 +142,10 @@ class RTVEInfantilIE(InfoExtractor): 'thumbnail': 'http://www.rtve.es/resources/jpg/6/5/1426182947956.JPG', 'duration': 357.958, }, - },] + }] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - short_tittle = mobj.group('short_tittle') + video_id = self._match_id(url) info = self._download_json( 'http://www.rtve.es/api/videos/%s/config/alacarta_videos.json' % video_id, video_id)['page']['items'][0] @@ -169,7 +168,6 @@ class RTVEInfantilIE(InfoExtractor): } - class RTVELiveIE(InfoExtractor): IE_NAME = 'rtve.es:live' IE_DESC = 'RTVE.es live streams'