From 00ef748cc0e35ee60efd0f7a00e373ab8d1af86b Mon Sep 17 00:00:00 2001 From: dirkf Date: Sun, 24 Sep 2023 22:00:13 +0100 Subject: [PATCH] [downloader] Fix baa6c5e: show ETA of http download as ETA instead of total d/l time --- youtube_dl/downloader/common.py | 2 +- youtube_dl/downloader/http.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py index afb4ee33d..91e691776 100644 --- a/youtube_dl/downloader/common.py +++ b/youtube_dl/downloader/common.py @@ -96,7 +96,7 @@ class FileDownloader(object): return None return int(float(remaining) / rate) start, now = (start_or_rate, now_or_remaining) - total, current = args + total, current = args[:2] if total is None: return None if now is None: diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index 28a49b9e8..3cad87420 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -294,7 +294,7 @@ class HttpFD(FileDownloader): # Progress message speed = self.calc_speed(start, now, byte_counter - ctx.resume_len) - eta = self.calc_eta(speed, ctx.data_len and (ctx.data_len - ctx.resume_len)) + eta = self.calc_eta(speed, ctx.data_len and (ctx.data_len - byte_counter)) self._hook_progress({ 'status': 'downloading',