From 0865f397ae6c875ec4194093af5c8f53e75f2285 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Wed, 28 Jan 2015 08:21:04 +0100 Subject: [PATCH 1/6] added extractor for dctp.tv --- youtube_dl/downloader/rtmp.py | 3 +++ youtube_dl/extractor/__init__.py | 1 + youtube_dl/extractor/dctp.py | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 youtube_dl/extractor/dctp.py diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index e06ebe8266..6cb1bfc50c 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -106,6 +106,7 @@ class RtmpFD(FileDownloader): protocol = info_dict.get('rtmp_protocol', None) no_resume = info_dict.get('no_resume', False) continue_dl = info_dict.get('continuedl', False) + real_time = info_dict.get('real_time', False) self.report_destination(filename) tmpfilename = self.temp_name(filename) @@ -143,6 +144,8 @@ class RtmpFD(FileDownloader): basic_args += ['--conn', conn] if protocol is not None: basic_args += ['--protocol', protocol] + if real_time: + basic_args += ['--realtime'] args = basic_args if not no_resume and continue_dl and not live: diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 03c56156a9..873ae69d3c 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -89,6 +89,7 @@ from .dailymotion import ( ) from .daum import DaumIE from .dbtv import DBTVIE +from .dctp import DctpTvIE from .deezer import DeezerPlaylistIE from .dfb import DFBIE from .dotsub import DotsubIE diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py new file mode 100644 index 0000000000..5382255f00 --- /dev/null +++ b/youtube_dl/extractor/dctp.py @@ -0,0 +1,41 @@ +# encoding: utf-8 +from __future__ import unicode_literals + +from .common import InfoExtractor + +class DctpTvIE(InfoExtractor): + _VALID_URL = r'^http://www.dctp.tv/(#/)?filme/(?P.+?)/$' + + def _real_extract(self, url): + video_id = self._match_id(url) + base_url = 'http://dctp-ivms2-restapi.s3.amazonaws.com/' + version_json = self._download_json(base_url + 'version.json', video_id) + version = version_json['version_name'] + info_json = self._download_json( + '{}{}/restapi/slugs/{}.json'.format(base_url, version, video_id), video_id) + object_id = info_json['object_id'] + meta_json = self._download_json( + '{}{}/restapi/media/{}.json'.format(base_url, version, object_id), video_id) + uuid = meta_json['uuid'] + title = meta_json['title'] + wide = meta_json['is_wide'] + if wide: + ratio = '16x9' + else: + ratio = '4x3' + play_path = 'mp4:{}_dctp_0500_{}.m4v'.format(uuid, ratio) + + servers_json = self._download_json('http://www.dctp.tv/streaming_servers/', video_id) + url = servers_json[0]['endpoint'] + + return { + 'id': video_id, + 'title': title, + 'format': 'rtmp', + 'url': url, + 'play_path': play_path, + 'real_time': True, + 'ext': 'flv' + } + + From 48a1e5141ad9f6b5c4ce8a355dcd7bf99c80e333 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Wed, 28 Jan 2015 08:59:58 +0100 Subject: [PATCH 2/6] added test for dctp --- youtube_dl/extractor/dctp.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index 5382255f00..9b687ef439 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -3,8 +3,16 @@ from __future__ import unicode_literals from .common import InfoExtractor + class DctpTvIE(InfoExtractor): _VALID_URL = r'^http://www.dctp.tv/(#/)?filme/(?P.+?)/$' + _TEST = { + 'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/', + 'info_dict': { + 'id': 'videoinstallation-fuer-eine-kaufhausfassade', + 'ext': 'flv', + 'title': 'Videoinstallation für eine Kaufhausfassade'} + } def _real_extract(self, url): video_id = self._match_id(url) @@ -38,4 +46,3 @@ class DctpTvIE(InfoExtractor): 'ext': 'flv' } - From f345fe9db77a900a603d753c73c5566d62c1cff9 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Thu, 29 Jan 2015 23:32:23 +0100 Subject: [PATCH 3/6] [dctp] fix python 2.6 compatibility --- youtube_dl/extractor/dctp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index 9b687ef439..31bcd35c3e 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -20,10 +20,10 @@ class DctpTvIE(InfoExtractor): version_json = self._download_json(base_url + 'version.json', video_id) version = version_json['version_name'] info_json = self._download_json( - '{}{}/restapi/slugs/{}.json'.format(base_url, version, video_id), video_id) + '{0}{1}/restapi/slugs/{2}.json'.format(base_url, version, video_id), video_id) object_id = info_json['object_id'] meta_json = self._download_json( - '{}{}/restapi/media/{}.json'.format(base_url, version, object_id), video_id) + '{0}{1}/restapi/media/{2}.json'.format(base_url, version, object_id), video_id) uuid = meta_json['uuid'] title = meta_json['title'] wide = meta_json['is_wide'] @@ -31,7 +31,7 @@ class DctpTvIE(InfoExtractor): ratio = '16x9' else: ratio = '4x3' - play_path = 'mp4:{}_dctp_0500_{}.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) url = servers_json[0]['endpoint'] From 87673cd4389f6798bb438bb46a306dc08c906cf5 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Thu, 29 Jan 2015 23:34:56 +0100 Subject: [PATCH 4/6] [dctp] follow id conventions --- youtube_dl/extractor/dctp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index 31bcd35c3e..752cff978a 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -37,12 +37,13 @@ class DctpTvIE(InfoExtractor): url = servers_json[0]['endpoint'] return { - 'id': video_id, + 'id': object_id, 'title': title, 'format': 'rtmp', 'url': url, 'play_path': play_path, 'real_time': True, - 'ext': 'flv' + 'ext': 'flv', + 'display_id': video_id } From 75a4fc5b7233d4cb4376b205c585eb4d3d486241 Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Fri, 30 Jan 2015 00:35:53 +0100 Subject: [PATCH 5/6] [dctp] fix test --- youtube_dl/extractor/dctp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index 752cff978a..c80d28865d 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -9,7 +9,8 @@ class DctpTvIE(InfoExtractor): _TEST = { 'url': 'http://www.dctp.tv/filme/videoinstallation-fuer-eine-kaufhausfassade/', 'info_dict': { - 'id': 'videoinstallation-fuer-eine-kaufhausfassade', + 'id': '1324', + 'display_id': 'videoinstallation-fuer-eine-kaufhausfassade', 'ext': 'flv', 'title': 'Videoinstallation für eine Kaufhausfassade'} } @@ -21,7 +22,7 @@ class DctpTvIE(InfoExtractor): version = version_json['version_name'] info_json = self._download_json( '{0}{1}/restapi/slugs/{2}.json'.format(base_url, version, video_id), video_id) - object_id = info_json['object_id'] + object_id = str(info_json['object_id']) meta_json = self._download_json( '{0}{1}/restapi/media/{2}.json'.format(base_url, version, object_id), video_id) uuid = meta_json['uuid'] From 7bb3ceb4c731c9783d2c565204cbc1071c3545ed Mon Sep 17 00:00:00 2001 From: Paul Hartmann Date: Fri, 30 Jan 2015 00:47:43 +0100 Subject: [PATCH 6/6] [dctp] prefix real_time parameter with rtmp_ --- youtube_dl/downloader/rtmp.py | 2 +- youtube_dl/extractor/dctp.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 6cb1bfc50c..f7eeb6f43f 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -104,9 +104,9 @@ class RtmpFD(FileDownloader): live = info_dict.get('rtmp_live', False) conn = info_dict.get('rtmp_conn', None) protocol = info_dict.get('rtmp_protocol', None) + real_time = info_dict.get('rtmp_real_time', False) no_resume = info_dict.get('no_resume', False) continue_dl = info_dict.get('continuedl', False) - real_time = info_dict.get('real_time', False) self.report_destination(filename) tmpfilename = self.temp_name(filename) diff --git a/youtube_dl/extractor/dctp.py b/youtube_dl/extractor/dctp.py index c80d28865d..8a77f2b662 100644 --- a/youtube_dl/extractor/dctp.py +++ b/youtube_dl/extractor/dctp.py @@ -43,7 +43,7 @@ class DctpTvIE(InfoExtractor): 'format': 'rtmp', 'url': url, 'play_path': play_path, - 'real_time': True, + 'rtmp_real_time': True, 'ext': 'flv', 'display_id': video_id }