debian/copyright: Update my copyright years.

[youtubedl] / youtube_dl / downloader / http.py

diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py
index e68f20c9f46a93ebfeca2ff47dc0843f4ab94874..2e3dac8251dbaf5d8b3e1a90bc459f362d14f72e 100644 (file)
--- a/youtube_dl/downloader/http.py
+++ b/youtube_dl/downloader/http.py
@@ -1,6 +1,8 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

+import errno

 import os
 import os

+import socket

 import time
 
 from .common import FileDownloader
 import time
 
 from .common import FileDownloader


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

-    format_bytes,

 )
 
 
 )
 
 


@@ -24,10 +25,6 @@ class HttpFD(FileDownloader):
 
         # Do not include the Accept-Encoding header
         headers = {'Youtubedl-no-compression': 'True'}
 
         # Do not include the Accept-Encoding header
         headers = {'Youtubedl-no-compression': 'True'}

-        if 'user_agent' in info_dict:
-            headers['Youtubedl-user-agent'] = info_dict['user_agent']
-        if 'http_referer' in info_dict:
-            headers['Referer'] = info_dict['http_referer']

         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)


@@ -103,6 +100,11 @@ class HttpFD(FileDownloader):
                             resume_len = 0
                             open_mode = 'wb'
                             break
                             resume_len = 0
                             open_mode = 'wb'
                             break

+            except socket.error as e:
+                if e.errno != errno.ECONNRESET:
+                    # Connection reset is no problem, just retry
+                    raise
+

             # Retry
             count += 1
             if count <= retries:
             # Retry
             count += 1
             if count <= retries:


@@ -133,7 +135,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()


@@ -161,6 +162,14 @@ class HttpFD(FileDownloader):
                 except (OSError, IOError) as err:
                     self.report_error('unable to open for writing: %s' % str(err))
                     return False
                 except (OSError, IOError) as err:
                     self.report_error('unable to open for writing: %s' % str(err))
                     return False

+
+                if self.params.get('xattr_set_filesize', False) and data_len is not None:
+                    try:
+                        import xattr
+                        xattr.setxattr(tmpfilename, 'user.ytdl.filesize', str(data_len))
+                    except(OSError, IOError, ImportError) as err:
+                        self.report_error('unable to set filesize xattr: %s' % str(err))
+

             try:
                 stream.write(data_block)
             except (IOError, OSError) as err:
             try:
                 stream.write(data_block)
             except (IOError, OSError) as err:


@@ -184,20 +193,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:


@@ -209,7 +217,13 @@ class HttpFD(FileDownloader):
             return False
         if tmpfilename != '-':
             stream.close()
             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)
         if data_len is not None and byte_counter != data_len:
             raise ContentTooShortError(byte_counter, int(data_len))
         self.try_rename(tmpfilename, filename)


@@ -223,6 +237,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