Merge pull request #1181 from h3xx/master

Add some verbosity when reporting finished downloads

Remove the mixed use of tabs and spaces for indentation.

diff --combined youtube_dl/FileDownloader.py
index 217c4a52f5204ccf471ccb1932a2f322571828eb,ab06533c0c023907c05554613ecd5f934334f329..4f6a238351523448b70b6927077809b636672e84
--- 1/youtube_dl/FileDownloader.py
--- 2/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@@ -79,13 -79,9 +79,13 @@@ class FileDownloader(object)
          rate = float(current) / dif
          eta = int((float(total) - float(current)) / rate)
          (eta_mins, eta_secs) = divmod(eta, 60)
 -        if eta_mins > 99:
 -            return '--:--'
 -        return '%02d:%02d' % (eta_mins, eta_secs)
 +        (eta_hours, eta_mins) = divmod(eta_mins, 60)
 +        if eta_hours > 99:
 +            return '--:--:--'
 +        if eta_hours == 0:
 +            return '%02d:%02d' % (eta_mins, eta_secs)
 +        else:
 +            return '%02d:%02d:%02d' % (eta_hours, eta_mins, eta_secs)
  
      @staticmethod
      def calc_speed(start, now, bytes):
@@@ -234,12 -230,14 +234,14 @@@
          """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'')
++            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)
@@@ -542,7 -540,7 +544,7 @@@
              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)