def addTask(self, task):
task.job = self
+ task.task_progress_changed = self.task_progress_changed_CB
self.tasks.append(task)
def start(self, callback):
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):
def setTool(self, tool):
self.cmd = tool
+ self.args = [tool]
self.global_preconditions.append(ToolExistsPrecondition())
self.postconditions.append(ReturncodePostcondition())
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)
self.prepare()
self.callback = callback
- self.task_progress_changed = task_progress_changed
from enigma import eConsoleAppContainer
self.container = eConsoleAppContainer()
self.container.appClosed.append(self.processFinished)
if self.cwd is not None:
self.container.setCWD(self.cwd)
- execstr = " ".join([self.cmd]+self.args)
- print "execute:", self.container.execute(execstr), execstr
+ print "execute:", self.container.execute(self.cmd, *self.args), self.cmd, self.args
if self.initial_input:
self.writeInput(self.initial_input)
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)
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
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):