From 0671f333fad5772c22dcdeb5a7b4eee9598ab0c5 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Oct 2017 14:03:56 +0100
Subject: [PATCH] Drop ETA guessing which was never really accurate

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/buildservice/jobs.py       | 22 ----------------------
 src/templates/jobs-detail.html |  6 ------
 src/web/__init__.py            | 14 --------------
 3 files changed, 42 deletions(-)

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 0d0dec9..7de4125 100644
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -438,28 +438,6 @@ class Job(base.DataObject):
 	def time_finished(self):
 		return self.data.time_finished
 
-	@property
-	def expected_runtime(self):
-		"""
-			Returns the estimated time and stddev, this job takes to finish.
-		"""
-		# Get the average build time.
-		build_times = self.backend.builds.get_build_times_by_arch(self.arch,
-			name=self.pkg.name)
-
-		# If there is no statistical data, we cannot estimate anything.
-		if not build_times:
-			return None, None
-
-		return build_times.average, build_times.stddev
-
-	@property
-	def eta(self):
-		expected_runtime, stddev = self.expected_runtime
-
-		if expected_runtime:
-			return expected_runtime - int(self.duration), stddev
-
 	def get_pkg_by_uuid(self, uuid):
 		pkg = self.backend.packages._get_package("SELECT packages.id FROM packages \
 			JOIN jobs_packages ON jobs_packages.pkg_id = packages.id \
diff --git a/src/templates/jobs-detail.html b/src/templates/jobs-detail.html
index 9a6fb14..9d605d5 100644
--- a/src/templates/jobs-detail.html
+++ b/src/templates/jobs-detail.html
@@ -135,12 +135,6 @@
 									{{ format_date(job.time_finished, full_format=True) }}
 								</p>
 							{% end %}
-							{% if job.is_running() %}
-								<p>
-									<strong>{{ _("ETA") }}</strong><br>
-									{{ format_eta(job.eta) }}
-								</p>
-							{% end %}
 					</div>
 				</div>
 			</div>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 4082b8e..8bcd689 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -89,7 +89,6 @@ class Application(tornado.web.Application):
 				"SelectTimezone"     : ui_modules.SelectTimezoneModule,
 			},
 			ui_methods = {
-				"format_eta"         : self.format_eta,
 				"format_time"        : self.format_time,
 			},
 			xsrf_cookies = True,
@@ -285,19 +284,6 @@ class Application(tornado.web.Application):
 
 	## UI methods
 
-	def format_eta(self, handler, (s, stddev)):
-		if s is None:
-			_ = handler.locale.translate
-			return _("Unknown")
-
-		if s < 0:
-			s = 0
-
-		return u"%s ± %s" % (
-			self.format_time(handler, s),
-			self.format_time_short(handler, stddev / 2),
-		)
-
 	def format_time(self, handler, s, shorter=False):
 		_ = handler.locale.translate
 
-- 
2.47.3