dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[dctp] Improve output (#4796)

This commit is contained in:
Philipp Hagemeister 2015-01-30 03:15:34 +01:00
parent cf8d6ec865
commit 6ebb0dca9f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/dctp.py
View File

@ -2,10 +2,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_str
class DctpTvIE(InfoExtractor): class DctpTvIE(InfoExtractor):
_VALID_URL = r'^http://www.dctp.tv/(#/)?filme/(?P<id>.+?)/$' _VALID_URL = r'http://www.dctp.tv/(#/)?filme/(?P<id>.+?)/$'
_TEST = { _TEST = {
'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/', 'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/',
'info_dict': { 'info_dict': {
@ -18,13 +19,17 @@ class DctpTvIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
base_url = 'http://dctp-ivms2-restapi.s3.amazonaws.com/' base_url = 'http://dctp-ivms2-restapi.s3.amazonaws.com/'
version_json = self._download_json(base_url + 'version.json', video_id) version_json = self._download_json(
base_url + 'version.json',
video_id, note='Determining file version')
version = version_json['version_name'] version = version_json['version_name']
info_json = self._download_json( info_json = self._download_json(
'{0}{1}/restapi/slugs/{2}.json'.format(base_url, version, video_id), video_id) '{0}{1}/restapi/slugs/{2}.json'.format(base_url, version, video_id),
object_id = str(info_json['object_id']) video_id, note='Fetching object ID')
object_id = compat_str(info_json['object_id'])
meta_json = self._download_json( meta_json = self._download_json(
'{0}{1}/restapi/media/{2}.json'.format(base_url, version, object_id), video_id) '{0}{1}/restapi/media/{2}.json'.format(base_url, version, object_id),
video_id, note='Downloading metadata')
uuid = meta_json['uuid'] uuid = meta_json['uuid']
title = meta_json['title'] title = meta_json['title']
wide = meta_json['is_wide'] wide = meta_json['is_wide']
@ -34,7 +39,9 @@ class DctpTvIE(InfoExtractor):
ratio = '4x3' ratio = '4x3'
play_path = 'mp4:{0}_dctp_0500_{1}.m4v'.format(uuid, ratio) play_path = 'mp4:{0}_dctp_0500_{1}.m4v'.format(uuid, ratio)
servers_json = self._download_json('http://www.dctp.tv/streaming_servers/', video_id) servers_json = self._download_json(
'http://www.dctp.tv/streaming_servers/',
video_id, note='Downloading server list')
url = servers_json[0]['endpoint'] url = servers_json[0]['endpoint']
return { return {