aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-06-07 15:33:45 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-06-07 15:35:13 +0200
commitd5519808235997db2189e840bf87c89693a208cc (patch)
treeb114bc77bd9d4b4648d3adc965eb3ed2a3ad4d11 /youtube_dl/extractor
parent4e0fb1280a8c1b392e5ce71aff796c94a12976a0 (diff)
[spiegeltv] Simplify and PEP8
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/common.py8
-rw-r--r--youtube_dl/extractor/spiegeltv.py49
2 files changed, 37 insertions, 20 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index db472aace..49e75405e 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -92,8 +92,12 @@ class InfoExtractor(object):
unique, but available before title. Typically, id is
something like "4234987", title "Dancing naked mole rats",
and display_id "dancing-naked-mole-rats"
- thumbnails: A list of dictionaries (with the entries "resolution" and
- "url") for the varying thumbnails
+ thumbnails: A list of dictionaries, with the following entries:
+ * "url"
+ * "width" (optional, int)
+ * "height" (optional, int)
+ * "resolution" (optional, string "{width}x{height"},
+ deprecated)
thumbnail: Full URL to a video thumbnail image.
description: One-line video description.
uploader: Full name of the video uploader.
diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py
index ffd554633..7f388aced 100644
--- a/youtube_dl/extractor/spiegeltv.py
+++ b/youtube_dl/extractor/spiegeltv.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
+
class SpiegeltvIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?spiegel\.tv/filme/(?P<id>[\-a-z0-9]+)'
_TEST = {
@@ -13,6 +14,7 @@ class SpiegeltvIE(InfoExtractor):
'ext': 'm4v',
'title': 'Flug MH370',
'description': 'Das Rätsel um die Boeing 777 der Malaysia-Airlines',
+ 'thumbnail': 're:http://.*\.jpg$',
},
'params': {
# rtmp download
@@ -27,36 +29,48 @@ class SpiegeltvIE(InfoExtractor):
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';
+ apihost = 'http://spiegeltv-ivms2-restapi.s3.amazonaws.com'
+ version_json = self._download_json(
+ '%s/version.json' % apihost, video_id,
+ note='Downloading version information')
+ version_name = version_json['version_name']
- 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),
+ video_id,
+ note='Downloading object information')
+ oid = slug_json['object_id']
- 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']
+ media_json = self._download_json(
+ '%s/%s/restapi/media/%s.json' % (apihost, version_name, oid),
+ video_id, note='Downloading media information')
+ 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']
+ server_json = self._download_json(
+ 'http://www.spiegel.tv/streaming_servers/', video_id,
+ note='Downloading server information')
+ 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']) })
+ thumbnails.append({
+ 'url': image['url'],
+ 'width': image['width'],
+ 'height': image['height'],
+ })
description = media_json['subtitle']
- duration = int(round(media_json['duration_in_ms'] / 1000))
+ duration = media_json['duration_in_ms'] / 1000.
if is_wide:
- format = '16x9'
+ format = '16x9'
else:
- format = '4x3'
+ format = '4x3'
url = server + 'mp4:' + uuid + '_spiegeltv_0500_' + format + '.m4v'
- return_dict = {
+ return {
'id': video_id,
'title': title,
'url': url,
@@ -64,5 +78,4 @@ class SpiegeltvIE(InfoExtractor):
'description': description,
'duration': duration,
'thumbnails': thumbnails
- }
- return return_dict
+ } \ No newline at end of file