From d9a9091317ab18518100a817984044e030b40433 Mon Sep 17 00:00:00 2001 From: awiebe Date: Tue, 6 Nov 2018 20:12:40 -0800 Subject: [PATCH 1/4] Added property long eta For tasks that run hours not seconds, a total average eta generally becomes more stable and accurate as the task progresses. --- progress/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/progress/__init__.py b/progress/__init__.py index 122406f..f0ce499 100644 --- a/progress/__init__.py +++ b/progress/__init__.py @@ -63,6 +63,10 @@ def elapsed(self): @property def elapsed_td(self): return timedelta(seconds=self.elapsed) + + @property + def long_avg(self):#Gets the total average instead of just the running average + return self.elapsed/self.index def update_avg(self, n, dt): if n > 0: @@ -135,6 +139,10 @@ def eta(self): @property def eta_td(self): return timedelta(seconds=self.eta) + + @property + def long_eta(self): #For long running tasks the total average is more stable + int(ceil(self.long_avg * self.remaining)) @property def percent(self): From 627bd95b537a7b18b4a98d34601811ffff82b2f7 Mon Sep 17 00:00:00 2001 From: awiebe Date: Tue, 6 Nov 2018 20:20:58 -0800 Subject: [PATCH 2/4] Add return to longg eta Add return --- progress/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/progress/__init__.py b/progress/__init__.py index f0ce499..928d88c 100644 --- a/progress/__init__.py +++ b/progress/__init__.py @@ -142,7 +142,7 @@ def eta_td(self): @property def long_eta(self): #For long running tasks the total average is more stable - int(ceil(self.long_avg * self.remaining)) + return int(ceil(self.long_avg * self.remaining)) @property def percent(self): From 5d00adae9e3c0a1bb11e439f0fdb98cd476aa124 Mon Sep 17 00:00:00 2001 From: awiebe Date: Tue, 6 Nov 2018 20:25:46 -0800 Subject: [PATCH 3/4] td form of long_eta --- progress/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/progress/__init__.py b/progress/__init__.py index 928d88c..bad5252 100644 --- a/progress/__init__.py +++ b/progress/__init__.py @@ -143,6 +143,9 @@ def eta_td(self): @property def long_eta(self): #For long running tasks the total average is more stable return int(ceil(self.long_avg * self.remaining)) + @property + def eta_td(self): + return timedelta(seconds=self.long_eta) @property def percent(self): From dba52cbbb5d67d081efac073495d83d19e0312a1 Mon Sep 17 00:00:00 2001 From: awiebe Date: Tue, 6 Nov 2018 20:53:40 -0800 Subject: [PATCH 4/4] Fix divide by zero long average --- progress/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/progress/__init__.py b/progress/__init__.py index bad5252..2405dd2 100644 --- a/progress/__init__.py +++ b/progress/__init__.py @@ -66,7 +66,7 @@ def elapsed_td(self): @property def long_avg(self):#Gets the total average instead of just the running average - return self.elapsed/self.index + return self.elapsed/(self.index+1) def update_avg(self, n, dt): if n > 0: