From 3dee7826e7133fb4a73aa0aabaee78499e49264f Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Sun, 25 Jan 2015 18:09:48 +0100 Subject: [rtl2] PEP8, simplify, make rtmp tests run (#470) --- youtube_dl/downloader/rtmp.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'youtube_dl/downloader') diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index 6f7ad588e..e06ebe826 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -105,7 +105,8 @@ class RtmpFD(FileDownloader): conn = info_dict.get('rtmp_conn', None) protocol = info_dict.get('rtmp_protocol', None) no_resume = info_dict.get('no_resume', False) - + continue_dl = info_dict.get('continuedl', False) + self.report_destination(filename) tmpfilename = self.temp_name(filename) test = self.params.get('test', False) @@ -142,10 +143,12 @@ class RtmpFD(FileDownloader): basic_args += ['--conn', conn] if protocol is not None: basic_args += ['--protocol', protocol] - if not no_resume: - basic_args += ['--resume'] - - args = basic_args + [[], ['--skip', '1']][not live and self.params.get('continuedl', False)] + + args = basic_args + if not no_resume and continue_dl and not live: + args += ['--resume'] + if not live and continue_dl: + args += ['--skip', '1'] if sys.platform == 'win32' and sys.version_info < (3, 0): # Windows subprocess module does not actually support Unicode -- cgit v1.2.3