|
@ -226,6 +226,22 @@ class FileDownloader(object): |
|
|
(clear_line, percent_str, data_len_str, speed_str, eta_str), skip_eol=True) |
|
|
(clear_line, percent_str, data_len_str, speed_str, eta_str), skip_eol=True) |
|
|
self.to_console_title(u'youtube-dl - %s of %s at %s ETA %s' % |
|
|
self.to_console_title(u'youtube-dl - %s of %s at %s ETA %s' % |
|
|
(percent_str.strip(), data_len_str.strip(), speed_str.strip(), eta_str.strip())) |
|
|
(percent_str.strip(), data_len_str.strip(), speed_str.strip(), eta_str.strip())) |
|
|
|
|
|
|
|
|
|
|
|
def report_progress_live_stream(self, downloaded_data_len, speed, elapsed): |
|
|
|
|
|
if self.params.get('noprogress', False): |
|
|
|
|
|
return |
|
|
|
|
|
clear_line = (u'\x1b[K' if sys.stderr.isatty() and os.name != 'nt' else u'') |
|
|
|
|
|
downloaded_str = format_bytes(downloaded_data_len) |
|
|
|
|
|
speed_str = self.format_speed(speed) |
|
|
|
|
|
elapsed_str = FileDownloader.format_seconds(elapsed) |
|
|
|
|
|
if self.params.get('progress_with_newline', False): |
|
|
|
|
|
self.to_screen(u'[download] %s at %s' % |
|
|
|
|
|
(downloaded_str, speed_str)) |
|
|
|
|
|
else: |
|
|
|
|
|
self.to_screen(u'\r%s[download] %s at %s ET %s' % |
|
|
|
|
|
(clear_line, downloaded_str, speed_str, elapsed_str), skip_eol=True) |
|
|
|
|
|
self.to_console_title(u'youtube-dl - %s at %s ET %s' % |
|
|
|
|
|
(downloaded_str.strip(), speed_str.strip(), elapsed_str.strip())) |
|
|
|
|
|
|
|
|
def report_resuming_byte(self, resume_len): |
|
|
def report_resuming_byte(self, resume_len): |
|
|
"""Report attempt to resume at given byte.""" |
|
|
"""Report attempt to resume at given byte.""" |
|
@ -255,7 +271,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, live): |
|
|
|
|
|
|
|
|
def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url, live, conn): |
|
|
def run_rtmpdump(args): |
|
|
def run_rtmpdump(args): |
|
|
start = time.time() |
|
|
start = time.time() |
|
|
resume_percent = None |
|
|
resume_percent = None |
|
@ -301,11 +317,27 @@ class FileDownloader(object): |
|
|
'eta': eta, |
|
|
'eta': eta, |
|
|
'speed': speed, |
|
|
'speed': speed, |
|
|
}) |
|
|
}) |
|
|
elif self.params.get('verbose', False): |
|
|
|
|
|
if not cursor_in_new_line: |
|
|
|
|
|
self.to_screen(u'') |
|
|
|
|
|
cursor_in_new_line = True |
|
|
|
|
|
self.to_screen(u'[rtmpdump] '+line) |
|
|
|
|
|
|
|
|
else: |
|
|
|
|
|
# no percent for live streams |
|
|
|
|
|
mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec', line) |
|
|
|
|
|
if mobj: |
|
|
|
|
|
downloaded_data_len = int(float(mobj.group(1))*1024) |
|
|
|
|
|
time_now = time.time() |
|
|
|
|
|
speed = self.calc_speed(start, time_now, downloaded_data_len) |
|
|
|
|
|
self.report_progress_live_stream(downloaded_data_len, speed, time_now - start) |
|
|
|
|
|
cursor_in_new_line = False |
|
|
|
|
|
self._hook_progress({ |
|
|
|
|
|
'downloaded_bytes': downloaded_data_len, |
|
|
|
|
|
'tmpfilename': tmpfilename, |
|
|
|
|
|
'filename': filename, |
|
|
|
|
|
'status': 'downloading', |
|
|
|
|
|
'speed': speed, |
|
|
|
|
|
}) |
|
|
|
|
|
elif self.params.get('verbose', False): |
|
|
|
|
|
if not cursor_in_new_line: |
|
|
|
|
|
self.to_screen(u'') |
|
|
|
|
|
cursor_in_new_line = True |
|
|
|
|
|
self.to_screen(u'[rtmpdump] '+line) |
|
|
proc.wait() |
|
|
proc.wait() |
|
|
if not cursor_in_new_line: |
|
|
if not cursor_in_new_line: |
|
|
self.to_screen(u'') |
|
|
self.to_screen(u'') |
|
@ -338,6 +370,8 @@ class FileDownloader(object): |
|
|
basic_args += ['--stop', '1'] |
|
|
basic_args += ['--stop', '1'] |
|
|
if live: |
|
|
if live: |
|
|
basic_args += ['--live'] |
|
|
basic_args += ['--live'] |
|
|
|
|
|
if conn: |
|
|
|
|
|
basic_args += ['--conn', conn] |
|
|
args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)] |
|
|
args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)] |
|
|
|
|
|
|
|
|
if sys.platform == 'win32' and sys.version_info < (3, 0): |
|
|
if sys.platform == 'win32' and sys.version_info < (3, 0): |
|
@ -479,7 +513,8 @@ class FileDownloader(object): |
|
|
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('rtmp_live', False)) |
|
|
|
|
|
|
|
|
info_dict.get('rtmp_live', False), |
|
|
|
|
|
info_dict.get('rtmp_conn', None)) |
|
|
|
|
|
|
|
|
# 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'): |
|
|