]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
Add some verbosity when reporting finished downloads
authorDan Church <amphetamachine@gmail.com>
Sun, 4 Aug 2013 17:45:24 +0000 (12:45 -0500)
committerDan Church <amphetamachine@gmail.com>
Sun, 4 Aug 2013 17:45:24 +0000 (12:45 -0500)
For example:

    [download] Resuming download at byte 1868140
    [download] Destination: Entry #1-Bn59FJ4HrmU.flv
    [download] 100% of 3.27MiB in 4s

This format is meant to somewhat mirror the behavior of wget(1) when reporting finished downloads:

    100%[==================>] 54,836,682   788KB/s   in 74s

    2013-08-04 12:32:05 (728 KB/s) - 'google-chrome-stable_current_x86_64.rpm' saved [54836682/54836682]

youtube_dl/FileDownloader.py

index ea6b9d626efa7a18eafe20afa8c473d1afee315b..ab06533c0c023907c05554613ecd5f934334f329 100644 (file)
@@ -230,12 +230,14 @@ class FileDownloader(object):
         """Report it was impossible to resume download."""
         self.to_screen(u'[download] Unable to resume')
 
-    def report_finish(self):
+    def report_finish(self, data_len_str, tot_time):
         """Report download finished."""
         if self.params.get('noprogress', False):
             self.to_screen(u'[download] Download completed')
         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):
         self.report_destination(filename)
@@ -538,7 +540,7 @@ class FileDownloader(object):
             self.report_error(u'Did not get any data blocks')
             return False
         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:
             raise ContentTooShortError(byte_counter, int(data_len))
         self.try_rename(tmpfilename, filename)