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

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index 9a9d9fb7..86bd233e 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):
@@ -123,9 +127,11 @@ class Task(object):
 		self.cmd = None
 		self.cwd = "/tmp"
 		self.args = [ ]
+		self.cmdline = None
 		self.task_progress_changed = None
 		self.output_line = ""
 		job.addTask(self)
+		self.container = None
 
 	def setCommandline(self, cmd, args):
 		self.cmd = cmd
@@ -137,6 +143,9 @@ class Task(object):
 		self.global_preconditions.append(ToolExistsPrecondition())
 		self.postconditions.append(ReturncodePostcondition())
 
+	def setCmdline(self, cmdline):
+		self.cmdline = cmdline
+
 	def checkPreconditions(self, immediate = False):
 		not_met = [ ]
 		if immediate:
@@ -148,7 +157,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,20 +165,21 @@ 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)
-
-		assert self.cmd is not None
-		assert len(self.args) >= 1
+		self.container.appClosed.append(self.processFinished)
+		self.container.stdoutAvail.append(self.processStdout)
+		self.container.stderrAvail.append(self.processStderr)
 
 		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)
+		if not self.cmd and self.cmdline:
+			print "execute:", self.container.execute(self.cmdline), self.cmdline
+		else:
+			assert self.cmd is not None
+			assert len(self.args) >= 1
+			print "execute:", self.container.execute(self.cmd, *self.args), ' '.join(self.args)
 		if self.initial_input:
 			self.writeInput(self.initial_input)
 
@@ -202,7 +212,8 @@ class Task(object):
 		self.finish()
 
 	def abort(self):
-		self.container.kill()
+		if self.container:
+			self.container.kill()
 		self.finish(aborted = True)
 
 	def finish(self, aborted = False):
@@ -232,7 +243,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 +274,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
@@ -357,18 +370,21 @@ class DiskspacePrecondition(Condition):
 class ToolExistsPrecondition(Condition):
 	def check(self, task):
 		import os
-		if task.cmd[0]=='/':
-			realpath = task.cmd
-		else:
-			realpath = task.cwd + '/' + task.cmd
-		self.realpath = realpath
-		return os.access(realpath, os.X_OK)
+		
+		self.realpath = task.cmd
+		path = os.environ.get('PATH', '').split(os.pathsep)
+		absolutes = filter(lambda file: os.access(file, os.X_OK), map(lambda directory, file = task.cmd: os.path.join(directory, file), path))
+		if len(absolutes) > 0:
+			self.realpath = task.cmd[0]
+			return True
+		return False 
 
 	def getErrorMessage(self, task):
 		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):