| |
@@ -1,7 +1,5 @@
|
| |
# coding: utf-8
|
| |
|
| |
- from datetime import timedelta
|
| |
-
|
| |
try:
|
| |
from progress.bar import Bar
|
| |
except ImportError:
|
| |
@@ -25,13 +23,9 @@
|
| |
|
| |
@property
|
| |
def download_speed(self):
|
| |
- if self.elapsed == 0:
|
| |
- return "0MB/s"
|
| |
- return format_size(self.index/self.elapsed) + "/s"
|
| |
-
|
| |
- @property
|
| |
- def myeta_td(self):
|
| |
- return timedelta(seconds=int(self.remaining*self.elapsed/self.index))
|
| |
+ if self.avg == 0.0:
|
| |
+ return "..."
|
| |
+ return format_size(1 / self.avg) + "/s"
|
| |
|
| |
@property
|
| |
def downloaded(self):
|
| |
@@ -53,7 +47,6 @@
|
| |
if progress:
|
| |
class ProgressBar(Bar, ProgressMixin):
|
| |
message = "%(percent)d%%"
|
| |
- suffix = "%(downloaded)s %(download_speed)s eta %(myeta_td)s"
|
| |
-
|
| |
+ suffix = "%(downloaded)s %(download_speed)s eta %(eta_td)s"
|
| |
else:
|
| |
ProgressBar = DummyBar
|
| |
praiskup
commented 7 years ago
This has been fixed in f24+ by rhbz#1299634. The benefit of
official API is that it implements "moving average" speed (the
real speed for latest several seconds), instead of average
download speed for the whole download time.
This reverts commit fc498e2.