X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e713bd3d222127573350eddb3f71941fda771054..68182033644faf17e06f10d1b98a128b5e3a7058:/lib/python/Components/Task.py

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 9a9d9fb7..9a768425 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -37,11 +37,15 @@ class Job(object):
 
 	progress = property(getProgress)
 
+	def getStatustext(self):
+		return { self.NOT_STARTED: _("Waiting"), self.IN_PROGRESS: _("In Progress"), self.FINISHED: _("Finished"), self.FAILED: _("Failed") }[self.status]
+
 	def task_progress_changed_CB(self):
 		self.state_changed()
 
 	def addTask(self, task):
 		task.job = self
+		task.task_progress_changed = self.task_progress_changed_CB
 		self.tasks.append(task)
 
 	def start(self, callback):
@@ -67,7 +71,7 @@ class Job(object):
 			else:
 				print "still waiting for %d resident task(s) %s to finish" % (len(self.resident_tasks), str(self.resident_tasks))
 		else:
-			self.tasks[self.current_task].run(self.taskCallback, self.task_progress_changed_CB)
+			self.tasks[self.current_task].run(self.taskCallback)
 			self.state_changed()
 
 	def taskCallback(self, task, res, stay_resident = False):
@@ -148,7 +152,7 @@ class Task(object):
 				not_met.append(precondition)
 		return not_met
 
-	def run(self, callback, task_progress_changed):
+	def run(self, callback):
 		failed_preconditions = self.checkPreconditions(True) + self.checkPreconditions(False)
 		if len(failed_preconditions):
 			callback(self, failed_preconditions)
@@ -156,12 +160,11 @@ class Task(object):
 		self.prepare()
 
 		self.callback = callback
-		self.task_progress_changed = task_progress_changed
 		from enigma import eConsoleAppContainer
 		self.container = eConsoleAppContainer()
-		self.container.appClosed.get().append(self.processFinished)
-		self.container.stdoutAvail.get().append(self.processStdout)
-		self.container.stderrAvail.get().append(self.processStderr)
+		self.container.appClosed.append(self.processFinished)
+		self.container.stdoutAvail.append(self.processStdout)
+		self.container.stderrAvail.append(self.processStderr)
 
 		assert self.cmd is not None
 		assert len(self.args) >= 1
@@ -169,7 +172,7 @@ class Task(object):
 		if self.cwd is not None:
 			self.container.setCWD(self.cwd)
 
-		print "execute:", self.container.execute(self.cmd, self.args), self.cmd, " ".join(self.args)
+		print "execute:", self.container.execute(self.cmd, *self.args), self.cmd, self.args
 		if self.initial_input:
 			self.writeInput(self.initial_input)
 
@@ -232,7 +235,8 @@ class Task(object):
 		if progress < 0:
 			progress = 0
 		self.__progress = progress
-		self.task_progress_changed()
+		if self.task_progress_changed:
+			self.task_progress_changed()
 
 	progress = property(getProgress, setProgress)
 
@@ -262,6 +266,7 @@ class JobManager:
 		from Tools import Notifications
 		if self.in_background:
 			from Screens.TaskView import JobView
+			self.in_background = False
 			Notifications.AddNotification(JobView, self.active_job)
 		if problems:
 			from Screens.MessageBox import MessageBox
@@ -368,7 +373,8 @@ class ToolExistsPrecondition(Condition):
 		return _("A required tool (%s) was not found.") % (self.realpath)
 
 class AbortedPostcondition(Condition):
-	pass
+	def getErrorMessage(self, task):
+		return "Cancelled upon user request"
 
 class ReturncodePostcondition(Condition):
 	def check(self, task):