diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-08-21 05:44:19 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-08-21 05:44:19 +0200 |
| commit | 6c3e6e88d3aaaea64ca3d96c005da654c89c8a3a (patch) | |
| tree | 0fbae8d38b05dc6c69ab40ebb62762836f259ae5 /youtube_dl | |
| parent | 739674cd77d6a6c7025878701939d987fac5b446 (diff) | |
| download | youtube-dl-6c3e6e88d3aaaea64ca3d96c005da654c89c8a3a.tar.xz | |
Allow hours in ETA display (Fixes #1280)
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/FileDownloader.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index ea6b9d626..217c4a52f 100644 --- 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): |