]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[rtve.es:infantil] Minor fixes (closes #5214)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 15 Mar 2015 21:17:40 +0000 (22:17 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 15 Mar 2015 21:18:41 +0000 (22:18 +0100)
youtube_dl/extractor/rtve.py

index b701a322ae1020d1bcaedcaf35876486ac5c9e16..13f07107753e0945e4d9e203a2bc6dd8814d4868 100644 (file)
@@ -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'