Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-22 01:52:51 +08:00
Code Issues Releases Wiki Activity

Use long rtmpdump options

Browse Source 
Note that we accidentally called rtmpdump with -v (--live) instead of -V (--verbose) because we missed this.
This commit is contained in:
Philipp Hagemeister 2013-06-10 18:14:44 +02:00
parent 53f72b11e5
commit 8cd252f115
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/FileDownloader.py
View File

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