From ad7a071ab678d8ec5a2cee21efbf1a88a8ff8544 Mon Sep 17 00:00:00 2001 From: rzhxeo Date: Sun, 6 Oct 2013 20:55:24 +0200 Subject: [PATCH 1/2] Only download 1 sec. with rtmpdump in test mode --- youtube_dl/FileDownloader.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index d6673fd3a..f1ff0b520 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -267,7 +267,7 @@ class FileDownloader(object): self.to_screen(u'\r%s[download] 100%% of %s in %s' % (clear_line, data_len_str, self.format_seconds(tot_time))) - def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url): + def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url, test): self.report_destination(filename) tmpfilename = self.temp_name(filename) @@ -291,6 +291,8 @@ class FileDownloader(object): basic_args += ['--playpath', play_path] if tc_url is not None: basic_args += ['--tcUrl', url] + if test: + basic_args += ['--stop', '1'] args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)] if self.params.get('verbose', False): try: @@ -408,7 +410,8 @@ class FileDownloader(object): info_dict.get('player_url', None), info_dict.get('page_url', None), info_dict.get('play_path', None), - info_dict.get('tc_url', None)) + info_dict.get('tc_url', None), + self.params.get('test', False)) # Attempt to download using mplayer if url.startswith('mms') or url.startswith('rtsp'): From 8e4f824365543e394286742fcdb4c0a548becc8e Mon Sep 17 00:00:00 2001 From: rzhxeo Date: Sun, 6 Oct 2013 22:04:32 +0200 Subject: [PATCH 2/2] Remove test parameter from _download_with_rtmpdump --- youtube_dl/FileDownloader.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index f1ff0b520..2cda5d52a 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -267,7 +267,7 @@ class FileDownloader(object): self.to_screen(u'\r%s[download] 100%% of %s in %s' % (clear_line, data_len_str, self.format_seconds(tot_time))) - def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url, test): + def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url): self.report_destination(filename) tmpfilename = self.temp_name(filename) @@ -291,7 +291,7 @@ class FileDownloader(object): basic_args += ['--playpath', play_path] if tc_url is not None: basic_args += ['--tcUrl', url] - if test: + if self.params.get('test', False): basic_args += ['--stop', '1'] args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)] if self.params.get('verbose', False): @@ -410,8 +410,7 @@ class FileDownloader(object): info_dict.get('player_url', None), info_dict.get('page_url', None), info_dict.get('play_path', None), - info_dict.get('tc_url', None), - self.params.get('test', False)) + info_dict.get('tc_url', None)) # Attempt to download using mplayer if url.startswith('mms') or url.startswith('rtsp'):