aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-03-15 22:17:40 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-03-15 22:18:41 +0100
commitb68eedba23cbb4cc419e3568055bfb86c5975054 (patch)
tree2d84c9f3ffae5beb4a10c6ab062fc57938b38509
parentd5b559393b793f21f6566321fa08a6bbbe6f524e (diff)
[rtve.es:infantil] Minor fixes (closes #5214)
-rw-r--r--youtube_dl/extractor/rtve.py14
1 files changed, 6 insertions, 8 deletions
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<show>[^/]*)/video/(?P<short_tittle>[^/]*)/(?P<id>[0-9]+)/'
+ IE_NAME = 'rtve.es:infantil'
+ IE_DESC = 'RTVE infantil'
+ _VALID_URL = r'https?://(?:www\.)?rtve\.es/infantil/serie/(?P<show>[^/]*)/video/(?P<short_title>[^/]*)/(?P<id>[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'