X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FConsole.py;h=a41317eabc2b66c2d7f1159e760a6412038ae0b9;hp=c5fa5f9810456c3ec051e4146c3edeb3e3f46ca8;hb=804ad88e6679853bd2db717fc542263d48075631;hpb=6bb94cd5b0d8fd3608afe84e8d76aef554a4b401

diff --git a/lib/python/Components/Console.py b/lib/python/Components/Console.py
old mode 100644
new mode 100755
index c5fa5f9..a41317e
--- a/lib/python/Components/Console.py
+++ b/lib/python/Components/Console.py
@@ -8,7 +8,7 @@ class Console(object):
 		self.callbacks = {}
 		self.extra_args = {}
 
-	def ePopen(self, cmd, callback, extra_args=[]):
+	def ePopen(self, cmd, callback=None, extra_args=[]):
 		name = cmd
 		i = 0
 		while self.appContainers.has_key(name):
@@ -21,7 +21,9 @@ class Console(object):
 		self.appContainers[name] = eConsoleAppContainer()
 		self.appContainers[name].dataAvail.append(boundFunction(self.dataAvailCB,name))
 		self.appContainers[name].appClosed.append(boundFunction(self.finishedCB,name))
-		retval = self.appContainers[name].execute(cmd)
+		if isinstance(cmd, str): # until .execute supports a better api
+			cmd = [cmd]
+		retval = self.appContainers[name].execute(*cmd)
 		if retval:
 			self.finishedCB(name, retval)
 
@@ -50,5 +52,15 @@ class Console(object):
 		extra_args = self.extra_args[name]
 		del self.appContainers[name]
 		del self.extra_args[name]
-		self.callbacks[name](data,retval,extra_args)
+		if self.callbacks[name]:
+			self.callbacks[name](data,retval,extra_args)
 		del self.callbacks[name]
+
+	def kill(self,name):
+		if name in self.appContainers:
+			print "[Console] killing: ",self.appContainers[name]
+			self.appContainers[name].kill()
+
+	def killAll(self):
+		for name in self.appContainers:
+			self.kill(name)