|
|
|
@ -629,7 +629,7 @@ class FileDownloader(object):
|
|
|
|
|
except (IOError, OSError):
|
|
|
|
|
self.report_warning(u'Unable to remove downloaded video file')
|
|
|
|
|
|
|
|
|
|
def _download_with_rtmpdump(self, filename, url, player_url, page_url):
|
|
|
|
|
def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path):
|
|
|
|
|
self.report_destination(filename)
|
|
|
|
|
tmpfilename = self.temp_name(filename)
|
|
|
|
|
|
|
|
|
@ -648,6 +648,8 @@ class FileDownloader(object):
|
|
|
|
|
basic_args += ['-W', player_url]
|
|
|
|
|
if page_url is not None:
|
|
|
|
|
basic_args += ['--pageUrl', page_url]
|
|
|
|
|
if play_path is not None:
|
|
|
|
|
basic_args += ['-y', play_path]
|
|
|
|
|
args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]
|
|
|
|
|
if self.params.get('verbose', False):
|
|
|
|
|
try:
|
|
|
|
@ -702,7 +704,8 @@ class FileDownloader(object):
|
|
|
|
|
if url.startswith('rtmp'):
|
|
|
|
|
return self._download_with_rtmpdump(filename, url,
|
|
|
|
|
info_dict.get('player_url', None),
|
|
|
|
|
info_dict.get('page_url', None))
|
|
|
|
|
info_dict.get('page_url', None),
|
|
|
|
|
info_dict.get('play_path', None))
|
|
|
|
|
|
|
|
|
|
tmpfilename = self.temp_name(filename)
|
|
|
|
|
stream = None
|
|
|
|
|