aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/downloader/rtmp.py
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-01-25 18:09:48 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-01-25 18:09:48 +0100
commit3dee7826e7133fb4a73aa0aabaee78499e49264f (patch)
tree98a613c598ed0412f7cb85e414d4cf32dc57673b /youtube_dl/downloader/rtmp.py
parentc9326b38b824eb8babbf2306b3bfe4bd5e683cfe (diff)
[rtl2] PEP8, simplify, make rtmp tests run (#470)
Diffstat (limited to 'youtube_dl/downloader/rtmp.py')
-rw-r--r--youtube_dl/downloader/rtmp.py13
1 files changed, 8 insertions, 5 deletions
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