commit 6c3e6e88d3aaaea64ca3d96c005da654c89c8a3a
parent 739674cd77d6a6c7025878701939d987fac5b446
Author: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 21 Aug 2013 05:44:19 +0200
Allow hours in ETA display (Fixes #1280)
Diffstat:
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
@@ -79,9 +79,13 @@ class FileDownloader(object):
rate = float(current) / dif
eta = int((float(total) - float(current)) / rate)
(eta_mins, eta_secs) = divmod(eta, 60)
- if eta_mins > 99:
- return '--:--'
- return '%02d:%02d' % (eta_mins, eta_secs)
+ (eta_hours, eta_mins) = divmod(eta_mins, 60)
+ if eta_hours > 99:
+ return '--:--:--'
+ if eta_hours == 0:
+ return '%02d:%02d' % (eta_mins, eta_secs)
+ else:
+ return '%02d:%02d:%02d' % (eta_hours, eta_mins, eta_secs)
@staticmethod
def calc_speed(start, now, bytes):