Merge tag 'upstream/2015.07.21'

[youtubedl] / youtube_dl / downloader / http.py

diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py
index 49170cf9d47634602efe7832b235e4a751e25817..b7f144af9ea33a102246632e04e71707be3d98ad 100644 (file)
--- a/youtube_dl/downloader/http.py
+++ b/youtube_dl/downloader/http.py
@@ -1,11 +1,10 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

+import errno

 import os
 import os

+import socket

 import time
 
 import time
 

-from socket import error as SocketError
-import errno
-

 from .common import FileDownloader
 from ..compat import (
     compat_urllib_request,
 from .common import FileDownloader
 from ..compat import (
     compat_urllib_request,


@@ -15,7 +14,6 @@ from ..utils import (
     ContentTooShortError,
     encodeFilename,
     sanitize_open,
     ContentTooShortError,
     encodeFilename,
     sanitize_open,

-    format_bytes,

 )
 
 
 )
 
 


@@ -30,13 +28,8 @@ class HttpFD(FileDownloader):
         add_headers = info_dict.get('http_headers')
         if add_headers:
             headers.update(add_headers)
         add_headers = info_dict.get('http_headers')
         if add_headers:
             headers.update(add_headers)

-        data = info_dict.get('http_post_data')
-        http_method = info_dict.get('http_method')
-        basic_request = compat_urllib_request.Request(url, data, headers)
-        request = compat_urllib_request.Request(url, data, headers)
-        if http_method is not None:
-            basic_request.get_method = lambda: http_method
-            request.get_method = lambda: http_method
+        basic_request = compat_urllib_request.Request(url, None, headers)
+        request = compat_urllib_request.Request(url, None, headers)

 
         is_test = self.params.get('test', False)
 
 
         is_test = self.params.get('test', False)
 


@@ -51,7 +44,7 @@ class HttpFD(FileDownloader):
 
         open_mode = 'wb'
         if resume_len != 0:
 
         open_mode = 'wb'
         if resume_len != 0:

-            if self.params.get('continuedl', False):
+            if self.params.get('continuedl', True):

                 self.report_resuming_byte(resume_len)
                 request.add_header('Range', 'bytes=%d-' % resume_len)
                 open_mode = 'ab'
                 self.report_resuming_byte(resume_len)
                 request.add_header('Range', 'bytes=%d-' % resume_len)
                 open_mode = 'ab'


@@ -94,6 +87,8 @@ class HttpFD(FileDownloader):
                             self._hook_progress({
                                 'filename': filename,
                                 'status': 'finished',
                             self._hook_progress({
                                 'filename': filename,
                                 'status': 'finished',

+                                'downloaded_bytes': resume_len,
+                                'total_bytes': resume_len,

                             })
                             return True
                         else:
                             })
                             return True
                         else:


@@ -102,7 +97,7 @@ class HttpFD(FileDownloader):
                             resume_len = 0
                             open_mode = 'wb'
                             break
                             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
                 if e.errno != errno.ECONNRESET:
                     # Connection reset is no problem, just retry
                     raise


@@ -137,7 +132,6 @@ class HttpFD(FileDownloader):
                 self.to_screen('\r[download] File is larger than max-filesize (%s bytes > %s bytes). Aborting.' % (data_len, max_data_len))
                 return False
 
                 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()
         byte_counter = 0 + resume_len
         block_size = self.params.get('buffersize', 1024)
         start = time.time()


@@ -196,20 +190,19 @@ class HttpFD(FileDownloader):
             # Progress message
             speed = self.calc_speed(start, now, byte_counter - resume_len)
             if data_len is None:
             # Progress message
             speed = self.calc_speed(start, now, byte_counter - resume_len)
             if data_len is None:

-                eta = percent = None
+                eta = None

             else:
             else:

-                percent = self.calc_percent(byte_counter, data_len)

                 eta = self.calc_eta(start, time.time(), data_len - resume_len, byte_counter - resume_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({
 
             self._hook_progress({

+                'status': 'downloading',

                 'downloaded_bytes': byte_counter,
                 'total_bytes': data_len,
                 'tmpfilename': tmpfilename,
                 'filename': filename,
                 'downloaded_bytes': byte_counter,
                 'total_bytes': data_len,
                 'tmpfilename': tmpfilename,
                 'filename': filename,

-                'status': 'downloading',

                 'eta': eta,
                 'speed': speed,
                 'eta': eta,
                 'speed': speed,

+                'elapsed': now - start,

             })
 
             if is_test and byte_counter == data_len:
             })
 
             if is_test and byte_counter == data_len:


@@ -221,7 +214,7 @@ class HttpFD(FileDownloader):
             return False
         if tmpfilename != '-':
             stream.close()
             return False
         if tmpfilename != '-':
             stream.close()

-        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)
         if data_len is not None and byte_counter != data_len:
             raise ContentTooShortError(byte_counter, int(data_len))
         self.try_rename(tmpfilename, filename)


@@ -235,6 +228,7 @@ class HttpFD(FileDownloader):
             'total_bytes': byte_counter,
             'filename': filename,
             'status': 'finished',
             'total_bytes': byte_counter,
             'filename': filename,
             'status': 'finished',

+            'elapsed': time.time() - start,

         })
 
         return True
         })
 
         return True