From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 17 Feb 2015 22:41:48 +0000 (+0100)
Subject: Merge branch 'progress-as-hook2'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=09ab40b7d1d1838aaf0ad2086e691a0d68e165f1;hp=-c

Merge branch 'progress-as-hook2'
---

09ab40b7d1d1838aaf0ad2086e691a0d68e165f1
diff --combined youtube_dl/downloader/http.py
index 25032ad4e,6dec528f2..2e3dac825
--- a/youtube_dl/downloader/http.py
+++ b/youtube_dl/downloader/http.py
@@@ -1,10 -1,11 +1,10 @@@
  from __future__ import unicode_literals
  
 +import errno
  import os
 +import socket
  import time
  
 -from socket import error as SocketError
 -import errno
 -
  from .common import FileDownloader
  from ..compat import (
      compat_urllib_request,
@@@ -14,7 -15,6 +14,6 @@@ from ..utils import 
      ContentTooShortError,
      encodeFilename,
      sanitize_open,
-     format_bytes,
  )
  
  
@@@ -101,7 -101,7 +100,7 @@@ class HttpFD(FileDownloader)
                              resume_len = 0
                              open_mode = 'wb'
                              break
 -            except SocketError as e:
 +            except socket.error as e:
                  if e.errno != errno.ECONNRESET:
                      # Connection reset is no problem, just retry
                      raise
@@@ -136,7 -136,6 +135,6 @@@
                  self.to_screen('\r[download] File is larger than max-filesize (%s bytes > %s bytes). Aborting.' % (data_len, max_data_len))
                  return False
  
-         data_len_str = format_bytes(data_len)
          byte_counter = 0 + resume_len
          block_size = self.params.get('buffersize', 1024)
          start = time.time()
@@@ -195,20 -194,19 +193,19 @@@
              # Progress message
              speed = self.calc_speed(start, now, byte_counter - resume_len)
              if data_len is None:
-                 eta = percent = None
+                 eta = None
              else:
-                 percent = self.calc_percent(byte_counter, data_len)
                  eta = self.calc_eta(start, time.time(), data_len - resume_len, byte_counter - resume_len)
-             self.report_progress(percent, data_len_str, speed, eta)
  
              self._hook_progress({
+                 'status': 'downloading',
                  'downloaded_bytes': byte_counter,
                  'total_bytes': data_len,
                  'tmpfilename': tmpfilename,
                  'filename': filename,
-                 'status': 'downloading',
                  'eta': eta,
                  'speed': speed,
+                 'elapsed': now - start,
              })
  
              if is_test and byte_counter == data_len:
@@@ -220,7 -218,13 +217,13 @@@
              return False
          if tmpfilename != '-':
              stream.close()
-         self.report_finish(data_len_str, (time.time() - start))
+ 
+         self._hook_progress({
+             'downloaded_bytes': byte_counter,
+             'total_bytes': data_len,
+             'tmpfilename': tmpfilename,
+             'status': 'error',
+         })
          if data_len is not None and byte_counter != data_len:
              raise ContentTooShortError(byte_counter, int(data_len))
          self.try_rename(tmpfilename, filename)
@@@ -234,6 -238,7 +237,7 @@@
              'total_bytes': byte_counter,
              'filename': filename,
              'status': 'finished',
+             'elapsed': time.time() - start,
          })
  
          return True