aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpukkandan <pukkandan.ytdlp@gmail.com>2021-11-03 16:28:45 +0530
committerpukkandan <pukkandan.ytdlp@gmail.com>2021-11-03 16:45:58 +0530
commitbd93fd5d45e104561bad919d4775feba869d0145 (patch)
treed0523e7953e4fe15ae5d7cea77befa9346099243
parentd89257f398fed8a44fae7d12d849114f9f4ca2be (diff)
downloadhypervideo-pre-bd93fd5d45e104561bad919d4775feba869d0145.tar.lz
hypervideo-pre-bd93fd5d45e104561bad919d4775feba869d0145.tar.xz
hypervideo-pre-bd93fd5d45e104561bad919d4775feba869d0145.zip
[fragment] Fix progress display in fragmented downloads
Closes #1517
-rw-r--r--yt_dlp/downloader/common.py2
-rw-r--r--yt_dlp/downloader/fragment.py14
2 files changed, 13 insertions, 3 deletions
diff --git a/yt_dlp/downloader/common.py b/yt_dlp/downloader/common.py
index 6cfbb6657..bcf8ac955 100644
--- a/yt_dlp/downloader/common.py
+++ b/yt_dlp/downloader/common.py
@@ -319,6 +319,8 @@ class FileDownloader(object):
msg_template = '%(_downloaded_bytes_str)s at %(_speed_str)s'
else:
msg_template = '%(_percent_str)s % at %(_speed_str)s ETA %(_eta_str)s'
+ if s.get('fragment_index'):
+ msg_template += ' (frag %(fragment_index)s)'
s['_default_template'] = msg_template % s
self._report_progress_status(s)
diff --git a/yt_dlp/downloader/fragment.py b/yt_dlp/downloader/fragment.py
index a9d1471f8..d08fd52a1 100644
--- a/yt_dlp/downloader/fragment.py
+++ b/yt_dlp/downloader/fragment.py
@@ -31,6 +31,10 @@ class HttpQuietDownloader(HttpFD):
def to_screen(self, *args, **kargs):
pass
+ def report_retry(self, err, count, retries):
+ super().to_screen(
+ f'[download] Got server HTTP error: {err}. Retrying (attempt {count} of {self.format_retries(retries)}) ...')
+
class FragmentFD(FileDownloader):
"""
@@ -167,7 +171,7 @@ class FragmentFD(FileDownloader):
self.ydl,
{
'continuedl': True,
- 'quiet': True,
+ 'quiet': self.params.get('quiet'),
'noprogress': True,
'ratelimit': self.params.get('ratelimit'),
'retries': self.params.get('retries', 0),
@@ -237,6 +241,7 @@ class FragmentFD(FileDownloader):
start = time.time()
ctx.update({
'started': start,
+ 'fragment_started': start,
# Amount of fragment's bytes downloaded by the time of the previous
# frag progress hook invocation
'prev_frag_downloaded_bytes': 0,
@@ -267,6 +272,9 @@ class FragmentFD(FileDownloader):
ctx['fragment_index'] = state['fragment_index']
state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes']
ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes']
+ ctx['speed'] = state['speed'] = self.calc_speed(
+ ctx['fragment_started'], time_now, frag_total_bytes)
+ ctx['fragment_started'] = time.time()
ctx['prev_frag_downloaded_bytes'] = 0
else:
frag_downloaded_bytes = s['downloaded_bytes']
@@ -275,8 +283,8 @@ class FragmentFD(FileDownloader):
state['eta'] = self.calc_eta(
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['speed'] = state['speed'] = self.calc_speed(
+ ctx['fragment_started'], time_now, frag_downloaded_bytes)
ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
self._hook_progress(state, info_dict)