From 211fd6c674f9294d3a1d22b0e7f519dcec0303e5 Mon Sep 17 00:00:00 2001 From: Georg Jaehnig Date: Fri, 30 May 2014 16:35:17 +0200 Subject: [PATCH 1/6] added spiegel.tv --- youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/spiegeltv.py | 73 +++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 youtube_dl/extractor/spiegeltv.py diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index def58f1d6a..b689dc3c99 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -258,6 +258,7 @@ from .southparkstudios import ( from .space import SpaceIE from .spankwire import SpankwireIE from .spiegel import SpiegelIE +from .spiegeltv import SpiegeltvIE from .spike import SpikeIE from .stanfordoc import StanfordOpenClassroomIE from .steam import SteamIE diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py new file mode 100644 index 0000000000..acb85ee64f --- /dev/null +++ b/youtube_dl/extractor/spiegeltv.py @@ -0,0 +1,73 @@ +# coding: utf-8 +from __future__ import unicode_literals + +import re +import json +import urllib +from .common import InfoExtractor + +class SpiegeltvIE(InfoExtractor): + _VALID_URL = r'https?://(?:www\.)?spiegel\.tv/filme/(?P[\-a-z0-9]+)' + _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', + } + } + + def _real_extract(self, url): + mobj = re.match(self._VALID_URL, url) + video_id = mobj.group('id') + + # TODO more code goes here, for example ... + webpage = self._download_webpage(url, video_id) + title = self._html_search_regex(r'(.*?)', webpage, 'title') + + apihost = 'http://spiegeltv-ivms2-restapi.s3.amazonaws.com'; + + version_json_code = urllib.urlopen('%s/version.json' % apihost).read() + version_json = json.loads(version_json_code) + version_name = version_json['version_name'] + + slug_json_code = urllib.urlopen('%s/%s/restapi/slugs/%s.json' % (apihost, version_name, video_id)).read() + slug_json = json.loads(slug_json_code) + oid = slug_json['object_id'] + + media_json_code = urllib.urlopen('%s/%s/restapi/media/%s.json' % (apihost, version_name, oid)).read() + media_json = json.loads(media_json_code) + + uuid = media_json['uuid'] + is_wide = media_json['is_wide'] + + server_json_code = urllib.urlopen('http://www.spiegel.tv/streaming_servers/').read() + server_json = json.loads(server_json_code) + 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 From 4ffeca4ea29fe75821c8de5fbaf8d8f585f2dbb4 Mon Sep 17 00:00:00 2001 From: Georg Jaehnig Date: Fri, 30 May 2014 16:39:24 +0200 Subject: [PATCH 2/6] cleanup --- youtube_dl/extractor/spiegeltv.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py index acb85ee64f..e8f49bc52a 100644 --- a/youtube_dl/extractor/spiegeltv.py +++ b/youtube_dl/extractor/spiegeltv.py @@ -23,7 +23,6 @@ class SpiegeltvIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) video_id = mobj.group('id') - # TODO more code goes here, for example ... webpage = self._download_webpage(url, video_id) title = self._html_search_regex(r'(.*?)', webpage, 'title') From 0cdf576d86418273e604c43cc0d9a63a685bdc7c Mon Sep 17 00:00:00 2001 From: Georg Jaehnig Date: Fri, 30 May 2014 17:51:36 +0200 Subject: [PATCH 3/6] use provided function to get JSON --- youtube_dl/extractor/spiegeltv.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py index e8f49bc52a..f8265d0428 100644 --- a/youtube_dl/extractor/spiegeltv.py +++ b/youtube_dl/extractor/spiegeltv.py @@ -2,8 +2,6 @@ from __future__ import unicode_literals import re -import json -import urllib from .common import InfoExtractor class SpiegeltvIE(InfoExtractor): @@ -28,22 +26,17 @@ class SpiegeltvIE(InfoExtractor): apihost = 'http://spiegeltv-ivms2-restapi.s3.amazonaws.com'; - version_json_code = urllib.urlopen('%s/version.json' % apihost).read() - version_json = json.loads(version_json_code) + version_json = self._download_json('%s/version.json' % apihost, None) version_name = version_json['version_name'] - slug_json_code = urllib.urlopen('%s/%s/restapi/slugs/%s.json' % (apihost, version_name, video_id)).read() - slug_json = json.loads(slug_json_code) + slug_json = self._download_json('%s/%s/restapi/slugs/%s.json' % (apihost, version_name, video_id), None) oid = slug_json['object_id'] - media_json_code = urllib.urlopen('%s/%s/restapi/media/%s.json' % (apihost, version_name, oid)).read() - media_json = json.loads(media_json_code) - + 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_code = urllib.urlopen('http://www.spiegel.tv/streaming_servers/').read() - server_json = json.loads(server_json_code) + server_json = self._download_json('http://www.spiegel.tv/streaming_servers/', None) server = server_json[0]['endpoint'] thumbnails = [] From 14470ac87b8ea345683f2a9ccebb44d6a776d760 Mon Sep 17 00:00:00 2001 From: Georg Jaehnig Date: Fri, 30 May 2014 17:56:13 +0200 Subject: [PATCH 4/6] tabs as spaces --- youtube_dl/extractor/spiegeltv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py index f8265d0428..7869859f90 100644 --- a/youtube_dl/extractor/spiegeltv.py +++ b/youtube_dl/extractor/spiegeltv.py @@ -8,7 +8,7 @@ class SpiegeltvIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?spiegel\.tv/filme/(?P[\-a-z0-9]+)' _TEST = { 'url': 'http://www.spiegel.tv/filme/flug-mh370/', - 'md5': '700d62dc485f3a81cf9d52144e5ead59', + 'md5': '700d62dc485f3a81cf9d52144e5ead59', 'info_dict': { 'id': 'flug-mh370', 'ext': 'm4v', From db23d8d2a24b648efe1f4314f1687e4484f0dc8a Mon Sep 17 00:00:00 2001 From: Georg Jaehnig Date: Tue, 3 Jun 2014 16:50:54 +0200 Subject: [PATCH 5/6] [Spiegeltv] skip rtmp download to pass Travis test build --- youtube_dl/extractor/spiegeltv.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py index 7869859f90..303c110441 100644 --- a/youtube_dl/extractor/spiegeltv.py +++ b/youtube_dl/extractor/spiegeltv.py @@ -14,6 +14,10 @@ class SpiegeltvIE(InfoExtractor): 'ext': 'm4v', 'title': 'Flug MH370', 'description': 'Das Rätsel um die Boeing 777 der Malaysia-Airlines', + }, + 'params': { + # rtmp download + 'skip_download': True, } } From df53a98f2ba7d628d66189ea2733271a1da5a6ad Mon Sep 17 00:00:00 2001 From: Georg Jaehnig Date: Tue, 3 Jun 2014 17:52:39 +0200 Subject: [PATCH 6/6] [Spiegeltv] remove the md5 field to pass Travis test build --- youtube_dl/extractor/spiegeltv.py | 1 - 1 file changed, 1 deletion(-) diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py index 303c110441..ffd5546330 100644 --- a/youtube_dl/extractor/spiegeltv.py +++ b/youtube_dl/extractor/spiegeltv.py @@ -8,7 +8,6 @@ class SpiegeltvIE(InfoExtractor): _VALID_URL = r'https?://(?:www\.)?spiegel\.tv/filme/(?P[\-a-z0-9]+)' _TEST = { 'url': 'http://www.spiegel.tv/filme/flug-mh370/', - 'md5': '700d62dc485f3a81cf9d52144e5ead59', 'info_dict': { 'id': 'flug-mh370', 'ext': 'm4v',