projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[downloader/http] Request last data block of exact remaining size
[youtube-dl]
/
youtube_dl
/
downloader
/
http.py
diff --git
a/youtube_dl/downloader/http.py
b/youtube_dl/downloader/http.py
index 3c72ea18b2304befd5221960503ff5b6141304c3..5046878dfcd874013e737e85d32764a95737406e 100644
(file)
--- a/
youtube_dl/downloader/http.py
+++ b/
youtube_dl/downloader/http.py
@@
-227,7
+227,7
@@
class HttpFD(FileDownloader):
while True:
try:
# Download and write
while True:
try:
# Download and write
- data_block = ctx.data.read(block_size if
not is_test
else min(block_size, data_len - byte_counter))
+ data_block = ctx.data.read(block_size if
data_len is None
else min(block_size, data_len - byte_counter))
# socket.timeout is a subclass of socket.error but may not have
# errno set
except socket.timeout as e:
# socket.timeout is a subclass of socket.error but may not have
# errno set
except socket.timeout as e:
@@
-299,7
+299,7
@@
class HttpFD(FileDownloader):
'elapsed': now - ctx.start_time,
})
'elapsed': now - ctx.start_time,
})
- if
is_test
and byte_counter == data_len:
+ if
data_len is not None
and byte_counter == data_len:
break
if not is_test and ctx.chunk_size and ctx.data_len is not None and byte_counter < ctx.data_len:
break
if not is_test and ctx.chunk_size and ctx.data_len is not None and byte_counter < ctx.data_len: