projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'progress-as-hook2'
[youtube-dl]
/
youtube_dl
/
downloader
/
http.py
diff --git
a/youtube_dl/downloader/http.py
b/youtube_dl/downloader/http.py
index d37522aeae247b07a893f293c3039116c00fd7d0..2e3dac8251dbaf5d8b3e1a90bc459f362d14f72e 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,
)
)
@@
-102,7
+100,7
@@
class HttpFD(FileDownloader):
resume_len = 0
open_mode = 'wb'
break
resume_len = 0
open_mode = 'wb'
break
- except
SocketE
rror as e:
+ except
socket.e
rror 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
+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()
@@
-196,9
+193,8
@@
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)
self._hook_progress({
eta = self.calc_eta(start, time.time(), data_len - resume_len, byte_counter - resume_len)
self._hook_progress({