aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/downloader/common.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-08-26 23:55:48 +0700
committerSergey M․ <dstftw@gmail.com>2017-08-27 02:22:30 +0700
commita3c3a1e12898a57fc2323e4c7cc37ace35482ecf (patch)
treee381e1e6f932619b31575b68daf2432a104ce0e3 /youtube_dl/downloader/common.py
parent085d9dd9bebfd1692cfe07e8bcb844780bfe4700 (diff)
downloadyoutube-dl-a3c3a1e12898a57fc2323e4c7cc37ace35482ecf.tar.xz
[http] Rework HTTP downloader
* Simplify code and split into separate routines to facilitate maintaining * Make retry mechanism work on errors during actual download not only during connection establishment phase * Retry on ECONNRESET and ETIMEDOUT during reading data from network * Retry on content too short and various timeout errors * Show error description on retry * Closes #506, closes #809, closes #2849, closes #4240, closes #6023, closes #8625, closes #9483
Diffstat (limited to 'youtube_dl/downloader/common.py')
-rw-r--r--youtube_dl/downloader/common.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py
index 77242dacc..75b8166c5 100644
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dl/downloader/common.py
@@ -304,11 +304,11 @@ class FileDownloader(object):
"""Report attempt to resume at given byte."""
self.to_screen('[download] Resuming download at byte %s' % resume_len)
- def report_retry(self, count, retries):
+ def report_retry(self, err, count, retries):
"""Report retry in case of HTTP error 5xx"""
self.to_screen(
- '[download] Got server HTTP error. Retrying (attempt %d of %s)...'
- % (count, self.format_retries(retries)))
+ '[download] Got server HTTP error: %s. Retrying (attempt %d of %s)...'
+ % (error_to_compat_str(err), count, self.format_retries(retries)))
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""