[youtube] Fix extraction.

[youtube-dl] / youtube_dl / extractor / spiegeltv.py

diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py
index 303c1104411a71aba0e746c96939cfc9b33ae92d..6ccf4c3423a608d39b2bb4bfe1c189a1705cc8da 100644 (file)
--- a/youtube_dl/extractor/spiegeltv.py
+++ b/youtube_dl/extractor/spiegeltv.py
@@ -1,69 +1,17 @@
-# coding: utf-8
 from __future__ import unicode_literals
 
-import re
 from .common import InfoExtractor
+from .nexx import NexxIE
+
 
 class SpiegeltvIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?spiegel\.tv/filme/(?P<id>[\-a-z0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?spiegel\.tv/videos/(?P<id>\d+)'
     _TEST = {
-        'url': 'http://www.spiegel.tv/filme/flug-mh370/',
-        'md5': '700d62dc485f3a81cf9d52144e5ead59',
-        'info_dict': {
-            'id': 'flug-mh370',
-            'ext': 'm4v',
-            'title': 'Flug MH370',
-            'description': 'Das Rätsel um die Boeing 777 der Malaysia-Airlines',
-        },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        }
+        'url': 'http://www.spiegel.tv/videos/161681-flug-mh370/',
+        'only_matching': True,
     }
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, video_id)
-        title = self._html_search_regex(r'<h1.*?>(.*?)</h1>', webpage, 'title')
-
-        apihost           = 'http://spiegeltv-ivms2-restapi.s3.amazonaws.com';
-
-        version_json      = self._download_json('%s/version.json' % apihost, None)
-        version_name      = version_json['version_name']
-
-        slug_json         = self._download_json('%s/%s/restapi/slugs/%s.json' % (apihost, version_name, video_id), None)
-        oid               = slug_json['object_id']
-              
-        media_json        = self._download_json('%s/%s/restapi/media/%s.json' % (apihost, version_name, oid), None)
-        uuid              = media_json['uuid']
-        is_wide           = media_json['is_wide']
-
-        server_json       = self._download_json('http://www.spiegel.tv/streaming_servers/', None)
-        server            = server_json[0]['endpoint']
-
-        thumbnails = []
-        for image in media_json['images']:
-          thumbnails.append({'url': image['url'], 'resolution': str(image['width']) + 'x' + str(image['height']) })
-
-        description = media_json['subtitle']
-        duration = int(round(media_json['duration_in_ms'] / 1000))
-
-        if is_wide:
-          format = '16x9'
-        else:
-          format = '4x3'
-
-        url = server + 'mp4:' + uuid + '_spiegeltv_0500_' + format + '.m4v'
-
-        return_dict = {
-            'id': video_id,
-            'title': title,
-            'url': url,
-            'ext': 'm4v',
-            'description': description,
-            'duration': duration,
-            'thumbnails': thumbnails
-        }
-        return return_dict
+        return self.url_result(
+            'https://api.nexx.cloud/v3/748/videos/byid/%s'
+            % self._match_id(url), ie=NexxIE.ie_key())