debian/changelog: Imported Upstream version 2015.06.04.1.

[youtubedl] / youtube_dl / extractor / mitele.py

diff --git a/youtube_dl/extractor/mitele.py b/youtube_dl/extractor/mitele.py
index 2567583235617e52b6420419863dbc8d319c8201..7091f3335e8223ea0a089ba7cff127a983b12d7d 100644 (file)
--- a/youtube_dl/extractor/mitele.py
+++ b/youtube_dl/extractor/mitele.py
@@ -18,9 +18,8 @@ class MiTeleIE(InfoExtractor):
     IE_NAME = 'mitele.es'
     _VALID_URL = r'http://www\.mitele\.es/[^/]+/[^/]+/[^/]+/(?P<id>[^/]+)/'
 
     IE_NAME = 'mitele.es'
     _VALID_URL = r'http://www\.mitele\.es/[^/]+/[^/]+/[^/]+/(?P<id>[^/]+)/'
 

-    _TEST = {
+    _TESTS = [{

         'url': 'http://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144/',
         'url': 'http://www.mitele.es/programas-tv/diario-de/la-redaccion/programa-144/',

-        'md5': '6a75fe9d0d3275bead0cb683c616fddb',

         'info_dict': {
             'id': '0fce117d',
             'ext': 'mp4',
         'info_dict': {
             'id': '0fce117d',
             'ext': 'mp4',


@@ -29,7 +28,11 @@ class MiTeleIE(InfoExtractor):
             'display_id': 'programa-144',
             'duration': 2913,
         },
             'display_id': 'programa-144',
             'duration': 2913,
         },

-    }
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }]

 
     def _real_extract(self, url):
         episode = self._match_id(url)
 
     def _real_extract(self, url):
         episode = self._match_id(url)


@@ -56,12 +59,14 @@ class MiTeleIE(InfoExtractor):
             episode,
             transform_source=strip_jsonp
         )
             episode,
             transform_source=strip_jsonp
         )

+        formats = self._extract_m3u8_formats(
+            token_info['tokenizedUrl'], episode, ext='mp4')

 
         return {
             'id': embed_data['videoId'],
             'display_id': episode,
             'title': info_el.find('title').text,
 
         return {
             'id': embed_data['videoId'],
             'display_id': episode,
             'title': info_el.find('title').text,

-            'url': token_info['tokenizedUrl'],
+            'formats': formats,

             'description': get_element_by_attribute('class', 'text', webpage),
             'thumbnail': info_el.find('thumb').text,
             'duration': parse_duration(info_el.find('duration').text),
             'description': get_element_by_attribute('class', 'text', webpage),
             'thumbnail': info_el.find('thumb').text,
             'duration': parse_duration(info_el.find('duration').text),