|
|
@ -267,7 +267,7 @@ class FileDownloader(object):
|
|
|
|
self.to_screen(u'\r%s[download] 100%% of %s in %s' %
|
|
|
|
self.to_screen(u'\r%s[download] 100%% of %s in %s' %
|
|
|
|
(clear_line, data_len_str, self.format_seconds(tot_time)))
|
|
|
|
(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, live):
|
|
|
|
self.report_destination(filename)
|
|
|
|
self.report_destination(filename)
|
|
|
|
tmpfilename = self.temp_name(filename)
|
|
|
|
tmpfilename = self.temp_name(filename)
|
|
|
|
test = self.params.get('test', False)
|
|
|
|
test = self.params.get('test', False)
|
|
|
@ -294,6 +294,8 @@ class FileDownloader(object):
|
|
|
|
basic_args += ['--tcUrl', url]
|
|
|
|
basic_args += ['--tcUrl', url]
|
|
|
|
if test:
|
|
|
|
if test:
|
|
|
|
basic_args += ['--stop', '1']
|
|
|
|
basic_args += ['--stop', '1']
|
|
|
|
|
|
|
|
if live:
|
|
|
|
|
|
|
|
basic_args += ['--live']
|
|
|
|
args = basic_args + [[], ['--resume', '--skip', '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:
|
|
|
@ -411,7 +413,8 @@ class FileDownloader(object):
|
|
|
|
info_dict.get('player_url', None),
|
|
|
|
info_dict.get('player_url', None),
|
|
|
|
info_dict.get('page_url', None),
|
|
|
|
info_dict.get('page_url', None),
|
|
|
|
info_dict.get('play_path', None),
|
|
|
|
info_dict.get('play_path', None),
|
|
|
|
info_dict.get('tc_url', None))
|
|
|
|
info_dict.get('tc_url', None),
|
|
|
|
|
|
|
|
info_dict.get('live', False))
|
|
|
|
|
|
|
|
|
|
|
|
# Attempt to download using mplayer
|
|
|
|
# Attempt to download using mplayer
|
|
|
|
if url.startswith('mms') or url.startswith('rtsp'):
|
|
|
|
if url.startswith('mms') or url.startswith('rtsp'):
|
|
|
|