|
|
@ -763,21 +763,21 @@ class FileDownloader(object): |
|
|
|
except (OSError, IOError): |
|
|
|
self.report_error(u'RTMP download detected but "rtmpdump" could not be run') |
|
|
|
return False |
|
|
|
verbosity_option = '--verbose' if self.params.get('verbose', False) else '--quiet' |
|
|
|
|
|
|
|
# Download using rtmpdump. rtmpdump returns exit code 2 when |
|
|
|
# the connection was interrumpted and resuming appears to be |
|
|
|
# possible. This is part of rtmpdump's normal usage, AFAIK. |
|
|
|
basic_args = ['rtmpdump', '-q', '-r', url, '-o', tmpfilename] |
|
|
|
if self.params.get('verbose', False): basic_args[1] = '-v' |
|
|
|
basic_args = ['rtmpdump', verbosity_option, '-r', url, '-o', tmpfilename] |
|
|
|
if player_url is not None: |
|
|
|
basic_args += ['-W', player_url] |
|
|
|
basic_args += ['--swfVfy', player_url] |
|
|
|
if page_url is not None: |
|
|
|
basic_args += ['--pageUrl', page_url] |
|
|
|
if play_path is not None: |
|
|
|
basic_args += ['-y', play_path] |
|
|
|
basic_args += ['--playpath', play_path] |
|
|
|
if tc_url is not None: |
|
|
|
basic_args += ['--tcUrl', url] |
|
|
|
args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)] |
|
|
|
args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)] |
|
|
|
if self.params.get('verbose', False): |
|
|
|
try: |
|
|
|
import pipes |
|
|
|