X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/14d000b6d44919aaa81f5811ab77d1a294c8d129..5d7942d9b3c1eecef5167ce470d61f52be904e0a:/lib/python/Components/Task.py

diff --git a/lib/python/Components/Task.py b/lib/python/Components/Task.py
index e7fdd8f7..659660e8 100644
--- a/lib/python/Components/Task.py
+++ b/lib/python/Components/Task.py
@@ -37,6 +37,9 @@ 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()
 
@@ -53,7 +56,7 @@ class Job(object):
 		self.status = self.IN_PROGRESS
 		self.state_changed()
 		self.runNext()
-		sumTaskWeightings = sum([t.weighting for t in self.tasks])
+		sumTaskWeightings = sum([t.weighting for t in self.tasks]) or 1
 		self.weightScale = self.end / float(sumTaskWeightings)
 
 	def runNext(self):
@@ -160,7 +163,8 @@ class Task(object):
 		from enigma import eConsoleAppContainer
 		self.container = eConsoleAppContainer()
 		self.container.appClosed.get().append(self.processFinished)
-		self.container.dataAvail.get().append(self.processOutput)
+		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
@@ -177,6 +181,12 @@ class Task(object):
 
 	def cleanup(self, failed):
 		pass
+	
+	def processStdout(self, data):
+		self.processOutput(data)
+		
+	def processStderr(self, data):
+		self.processOutput(data)
 
 	def processOutput(self, data):
 		self.output_line += data
@@ -237,6 +247,7 @@ class JobManager:
 		self.active_jobs = [ ]
 		self.failed_jobs = [ ]
 		self.job_classes = [ ]
+		self.in_background = False
 		self.active_job = None
 
 	def AddJob(self, job):
@@ -251,10 +262,17 @@ class JobManager:
 
 	def jobDone(self, job, task, problems):
 		print "job", job, "completed with", problems, "in", task
+		from Tools import Notifications
+		if self.in_background:
+			from Screens.TaskView import JobView
+			Notifications.AddNotification(JobView, self.active_job)
 		if problems:
-			from Tools import Notifications
 			from Screens.MessageBox import MessageBox
-			Notifications.AddNotificationWithCallback(self.errorCB, MessageBox, _("Error: %s\nRetry?") % (problems[0].getErrorMessage(task)))
+			if problems[0].RECOVERABLE:
+				Notifications.AddNotificationWithCallback(self.errorCB, MessageBox, _("Error: %s\nRetry?") % (problems[0].getErrorMessage(task)))
+			else:
+				Notifications.AddNotification(MessageBox, _("Error") + (': %s') % (problems[0].getErrorMessage(task)), type = MessageBox.TYPE_ERROR )
+				self.errorCB(False)
 			return
 			#self.failed_jobs.append(self.active_job)
 
@@ -271,6 +289,12 @@ class JobManager:
 			self.active_job = None
 			self.kick()
 
+	def getPendingJobs(self):
+		list = [ ]
+		if self.active_job:
+			list.append(self.active_job)
+		list += self.active_jobs
+		return list
 # some examples:
 #class PartitionExistsPostcondition:
 #	def __init__(self, device):
@@ -310,7 +334,7 @@ class Condition:
 	RECOVERABLE = False
 
 	def getErrorMessage(self, task):
-		return _("An error has occured. (%s)") % (self.__class__.__name__)
+		return _("An unknown error occured!") + " (%s @ task %s)" % (self.__class__.__name__, task.__class__.__name__)
 
 class WorkspaceExistsPrecondition(Condition):
 	def check(self, task):