|
@ -234,12 +234,14 @@ class FileDownloader(object): |
|
|
"""Report it was impossible to resume download.""" |
|
|
"""Report it was impossible to resume download.""" |
|
|
self.to_screen(u'[download] Unable to resume') |
|
|
self.to_screen(u'[download] Unable to resume') |
|
|
|
|
|
|
|
|
def report_finish(self): |
|
|
|
|
|
|
|
|
def report_finish(self, data_len_str, tot_time): |
|
|
"""Report download finished.""" |
|
|
"""Report download finished.""" |
|
|
if self.params.get('noprogress', False): |
|
|
if self.params.get('noprogress', False): |
|
|
self.to_screen(u'[download] Download completed') |
|
|
self.to_screen(u'[download] Download completed') |
|
|
else: |
|
|
else: |
|
|
self.to_screen(u'') |
|
|
|
|
|
|
|
|
clear_line = (u'\x1b[K' if sys.stderr.isatty() and os.name != 'nt' else u'') |
|
|
|
|
|
self.to_screen(u'\r%s[download] 100%% of %s in %ss' % |
|
|
|
|
|
(clear_line, data_len_str, int(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): |
|
|
self.report_destination(filename) |
|
|
self.report_destination(filename) |
|
@ -542,7 +544,7 @@ class FileDownloader(object): |
|
|
self.report_error(u'Did not get any data blocks') |
|
|
self.report_error(u'Did not get any data blocks') |
|
|
return False |
|
|
return False |
|
|
stream.close() |
|
|
stream.close() |
|
|
self.report_finish() |
|
|
|
|
|
|
|
|
self.report_finish(data_len_str, (time.time() - start)) |
|
|
if data_len is not None and byte_counter != data_len: |
|
|
if data_len is not None and byte_counter != data_len: |
|
|
raise ContentTooShortError(byte_counter, int(data_len)) |
|
|
raise ContentTooShortError(byte_counter, int(data_len)) |
|
|
self.try_rename(tmpfilename, filename) |
|
|
self.try_rename(tmpfilename, filename) |
|
|