youtube_dl/extractor/mitele.py

@@ -1,14 +1,15 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-from .telecinco import TelecincoIE
+from .common import InfoExtractor
 from ..utils import (
     int_or_none,
     parse_iso8601,
+    smuggle_url,
 )
 
 
-class MiTeleIE(TelecincoIE):
+class MiTeleIE(InfoExtractor):
     IE_DESC = 'mitele.es'
     _VALID_URL = r'https?://(?:www\.)?mitele\.es/(?:[^/]+/)+(?P<id>[^/]+)/player'
 
@@ -30,6 +31,7 @@ class MiTeleIE(TelecincoIE):
             'timestamp': 1471209401,
             'upload_date': '20160814',
         },
+        'add_ie': ['Ooyala'],
     }, {
         # no explicit title
         'url': 'http://www.mitele.es/programas-tv/cuarto-milenio/57b0de3dc915da14058b4876/player',
@@ -52,6 +54,7 @@ class MiTeleIE(TelecincoIE):
         'params': {
             'skip_download': True,
         },
+        'add_ie': ['Ooyala'],
     }, {
         'url': 'http://www.mitele.es/series-online/la-que-se-avecina/57aac5c1c915da951a8b45ed/player',
         'only_matching': True,
@@ -67,11 +70,16 @@ class MiTeleIE(TelecincoIE):
             r'window\.\$REACTBASE_STATE\.prePlayer_mtweb\s*=\s*({.+})',
             webpage, 'Pre Player'), display_id)['prePlayer']
         title = pre_player['title']
-        video_info = self._parse_content(pre_player['video'], url)
+        video = pre_player['video']
+        video_id = video['dataMediaId']
         content = pre_player.get('content') or {}
         info = content.get('info') or {}
 
-        video_info.update({
+        return {
+            '_type': 'url_transparent',
+            # for some reason only HLS is supported
+            'url': smuggle_url('ooyala:' + video_id, {'supportedformats': 'm3u8,dash'}),
+            'id': video_id,
             'title': title,
             'description': info.get('synopsis'),
             'series': content.get('title'),
@@ -79,7 +87,7 @@ class MiTeleIE(TelecincoIE):
             'episode': content.get('subtitle'),
             'episode_number': int_or_none(info.get('episode_number')),
             'duration': int_or_none(info.get('duration')),
+            'thumbnail': video.get('dataPoster'),
             'age_limit': int_or_none(info.get('rating')),
             'timestamp': parse_iso8601(pre_player.get('publishedTime')),
-        })
+        }
-        return video_info

youtube_dl/extractor/teachable.py

@@ -140,7 +140,7 @@ class TeachableIE(TeachableBaseIE):
     @staticmethod
     def _is_teachable(webpage):
         return 'teachableTracker.linker:autoLink' in webpage and re.search(
-            r'<link[^>]+href=["\']https?://(?:process\.fs|assets)\.teachablecdn\.com',
+            r'<link[^>]+href=["\']https?://process\.fs\.teachablecdn\.com',
             webpage)
 
     @staticmethod

youtube_dl/extractor/telecinco.py

@@ -5,11 +5,14 @@ import json
 import re
 
 from .common import InfoExtractor
+from .ooyala import OoyalaIE
 from ..utils import (
     clean_html,
+    determine_ext,
     int_or_none,
     str_or_none,
     try_get,
+    urljoin,
 )
 
 
@@ -25,7 +28,7 @@ class TelecincoIE(InfoExtractor):
             'description': 'md5:716caf5601e25c3c5ab6605b1ae71529',
         },
         'playlist': [{
-            'md5': '7ee56d665cfd241c0e6d80fd175068b0',
+            'md5': 'adb28c37238b675dad0f042292f209a7',
             'info_dict': {
                 'id': 'JEA5ijCnF6p5W08A1rNKn7',
                 'ext': 'mp4',
@@ -35,7 +38,7 @@ class TelecincoIE(InfoExtractor):
         }]
     }, {
         'url': 'http://www.cuatro.com/deportes/futbol/barcelona/Leo_Messi-Champions-Roma_2_2052780128.html',
-        'md5': 'c86fe0d99e3bdb46b7950d38bf6ef12a',
+        'md5': '9468140ebc300fbb8b9d65dc6e5c4b43',
         'info_dict': {
             'id': 'jn24Od1zGLG4XUZcnUnZB6',
             'ext': 'mp4',
@@ -45,7 +48,7 @@ class TelecincoIE(InfoExtractor):
         },
     }, {
         'url': 'http://www.mediaset.es/12meses/campanas/doylacara/conlatratanohaytrato/Ayudame-dar-cara-trata-trato_2_1986630220.html',
-        'md5': 'eddb50291df704ce23c74821b995bcac',
+        'md5': 'ae2dc6b7b50b2392076a51c0f70e01f6',
         'info_dict': {
             'id': 'aywerkD2Sv1vGNqq9b85Q2',
             'ext': 'mp4',
@@ -87,24 +90,58 @@ class TelecincoIE(InfoExtractor):
 
     def _parse_content(self, content, url):
         video_id = content['dataMediaId']
+        if content.get('dataCmsId') == 'ooyala':
+            return self.url_result(
+                'ooyala:%s' % video_id, OoyalaIE.ie_key(), video_id)
+        config_url = urljoin(url, content['dataConfig'])
         config = self._download_json(
-            content['dataConfig'], video_id, 'Downloading config JSON')
+            config_url, video_id, 'Downloading config JSON')
         title = config['info']['title']
-        services = config['services']
+
-        caronte = self._download_json(services['caronte'], video_id)
+        def mmc_url(mmc_type):
-        stream = caronte['dls'][0]['stream']
+            return re.sub(
-        headers = self.geo_verification_headers()
+                r'/(?:flash|html5)\.json', '/%s.json' % mmc_type,
-        headers.update({
+                config['services']['mmc'])
-            'Content-Type': 'application/json;charset=UTF-8',
+
-            'Origin': re.match(r'https?://[^/]+', url).group(0),
+        duration = None
-        })
+        formats = []
-        cdn = self._download_json(
+        for mmc_type in ('flash', 'html5'):
-            caronte['cerbero'], video_id, data=json.dumps({
+            mmc = self._download_json(
-                'bbx': caronte['bbx'],
+                mmc_url(mmc_type), video_id,
-                'gbx': self._download_json(services['gbx'], video_id)['gbx'],
+                'Downloading %s mmc JSON' % mmc_type, fatal=False)
-            }).encode(), headers=headers)['tokens']['1']['cdn']
+            if not mmc:
-        formats = self._extract_m3u8_formats(
+                continue
-            stream + '?' + cdn, video_id, 'mp4', 'm3u8_native', m3u8_id='hls')
+            if not duration:
+                duration = int_or_none(mmc.get('duration'))
+            for location in mmc['locations']:
+                gat = self._proto_relative_url(location.get('gat'), 'http:')
+                gcp = location.get('gcp')
+                ogn = location.get('ogn')
+                if None in (gat, gcp, ogn):
+                    continue
+                token_data = {
+                    'gcp': gcp,
+                    'ogn': ogn,
+                    'sta': 0,
+                }
+                media = self._download_json(
+                    gat, video_id, data=json.dumps(token_data).encode('utf-8'),
+                    headers={
+                        'Content-Type': 'application/json;charset=utf-8',
+                        'Referer': url,
+                    }, fatal=False) or {}
+                stream = media.get('stream') or media.get('file')
+                if not stream:
+                    continue
+                ext = determine_ext(stream)
+                if ext == 'f4m':
+                    formats.extend(self._extract_f4m_formats(
+                        stream + '&hdcore=3.2.0&plugin=aasp-3.2.0.77.18',
+                        video_id, f4m_id='hds', fatal=False))
+                elif ext == 'm3u8':
+                    formats.extend(self._extract_m3u8_formats(
+                        stream, video_id, 'mp4', 'm3u8_native',
+                        m3u8_id='hls', fatal=False))
         self._sort_formats(formats)
 
         return {
@@ -112,7 +149,7 @@ class TelecincoIE(InfoExtractor):
             'title': title,
             'formats': formats,
             'thumbnail': content.get('dataPoster') or config.get('poster', {}).get('imageUrl'),
-            'duration': int_or_none(content.get('dataDuration')),
+            'duration': duration,
         }
 
     def _real_extract(self, url):

youtube_dl/extractor/youtube.py

@@ -321,7 +321,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
                             # Invidious instances taken from https://github.com/omarroth/invidious/wiki/Invidious-Instances
                             (?:(?:www|dev)\.)?invidio\.us/|
                             (?:(?:www|no)\.)?invidiou\.sh/|
-                            (?:(?:www|fi)\.)?invidious\.snopyta\.org/|
+                            (?:(?:www|fi|de)\.)?invidious\.snopyta\.org/|
                             (?:www\.)?invidious\.kabi\.tk/|
                             (?:www\.)?invidious\.13ad\.de/|
                             (?:www\.)?invidious\.mastodon\.host/|