projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ffddb11
)
[downloader/fragment] Fix ETA calculation of resumed download (#21992)
author
lightmare
<lightmare@users.noreply.github.com>
Sat, 10 Aug 2019 23:57:43 +0000
(
01:57
+0200)
committer
Sergey M
<dstftw@gmail.com>
Sat, 10 Aug 2019 23:57:43 +0000
(06:57 +0700)
youtube_dl/downloader/fragment.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/fragment.py
b/youtube_dl/downloader/fragment.py
index f2e5733b6406603f9a52b26b65bd4bc3cc833fec..02f35459e82ddb0e39dad3b7790f2db7a90d85fa 100644
(file)
--- a/
youtube_dl/downloader/fragment.py
+++ b/
youtube_dl/downloader/fragment.py
@@
-190,12
+190,13
@@
class FragmentFD(FileDownloader):
})
def _start_frag_download(self, ctx):
})
def _start_frag_download(self, ctx):
+ resume_len = ctx['complete_frags_downloaded_bytes']
total_frags = ctx['total_frags']
# This dict stores the download progress, it's updated by the progress
# hook
state = {
'status': 'downloading',
total_frags = ctx['total_frags']
# This dict stores the download progress, it's updated by the progress
# hook
state = {
'status': 'downloading',
- 'downloaded_bytes':
ctx['complete_frags_downloaded_bytes']
,
+ 'downloaded_bytes':
resume_len
,
'fragment_index': ctx['fragment_index'],
'fragment_count': total_frags,
'filename': ctx['filename'],
'fragment_index': ctx['fragment_index'],
'fragment_count': total_frags,
'filename': ctx['filename'],
@@
-234,8
+235,8
@@
class FragmentFD(FileDownloader):
state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
if not ctx['live']:
state['eta'] = self.calc_eta(
state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
if not ctx['live']:
state['eta'] = self.calc_eta(
- start, time_now, estimated_size,
- state['downloaded_bytes'])
+ start, time_now, estimated_size
- resume_len
,
+ state['downloaded_bytes']
- resume_len
)
state['speed'] = s.get('speed') or ctx.get('speed')
ctx['speed'] = state['speed']
ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
state['speed'] = s.get('speed') or ctx.get('speed')
ctx['speed'] = state['speed']
ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes