debian/control: Drop really ancient Recommends to have ffprobe.

[youtubedl] / youtube_dl / extractor / mitele.py

diff --git a/youtube_dl/extractor/mitele.py b/youtube_dl/extractor/mitele.py
index 2567583235617e52b6420419863dbc8d319c8201..852d722664a3d63aafed0f8246949335b4150c09 100644 (file)
--- a/youtube_dl/extractor/mitele.py
+++ b/youtube_dl/extractor/mitele.py
@@ -5,6 +5,7 @@ import json
 from .common import InfoExtractor
 from ..compat import (
     compat_urllib_parse,
 from .common import InfoExtractor
 from ..compat import (
     compat_urllib_parse,

+    compat_urllib_parse_unquote,

     compat_urlparse,
 )
 from ..utils import (
     compat_urlparse,
 )
 from ..utils import (


@@ -18,9 +19,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 +29,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)


@@ -45,7 +49,7 @@ class MiTeleIE(InfoExtractor):
             domain = 'http://' + domain
         info_url = compat_urlparse.urljoin(
             domain,
             domain = 'http://' + domain
         info_url = compat_urlparse.urljoin(
             domain,

-            compat_urllib_parse.unquote(embed_data['flashvars']['host'])
+            compat_urllib_parse_unquote(embed_data['flashvars']['host'])

         )
         info_el = self._download_xml(info_url, episode).find('./video/info')
 
         )
         info_el = self._download_xml(info_url, episode).find('./video/info')
 


@@ -56,12 +60,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),