X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/10bcb34f8993ecc000f027ecc8ce7fc89f0bda2b..fe4819c2c3bf9e67e8088aea8d85751cd5918ee5:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 01df7947..75bdd5bc 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -1,20 +1,20 @@
-from Screen import *
-from Components.MenuList import MenuList
+from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.ActionMap import NumberActionMap
-from Components.Header import Header
-from Components.Button import Button
 from Components.Label import Label
 
-from Components.HTMLComponent import *
-from Components.GUIComponent import *
-from Components.config import *
+from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN
 from Components.ConfigList import ConfigList
 
-from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
+from enigma import eTimer, eDVBCI_UI
 
-TYPE_MENU = 0
-TYPE_CONFIG = 1
+MAX_NUM_CI = 4
+
+def InitCiConfig():
+	config.ci = ConfigSubList()
+	for slot in range(MAX_NUM_CI):
+		config.ci.append(ConfigSubsection())
+		config.ci[slot].canDescrambleMultipleServices = ConfigSelection(choices = [("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))], default = "auto")
 
 class CiMmi(Screen):
 	def __init__(self, session, slotid, action):
@@ -22,18 +22,17 @@ class CiMmi(Screen):
 
 		print "ciMMI with action" + str(action)
 
+		self.tag = None
 		self.slotid = slotid
 
-		self.Timer = eTimer()
-		self.Timer.timeout.get().append(self.TimerCheck)
-		self.Timer.start(1000)
+		self.timer = eTimer()
+		self.timer.timeout.get().append(self.keyCancel)
 
 		#else the skins fails
 		self["title"] = Label("")
 		self["subtitle"] = Label("")
 		self["bottom"] = Label("")
 		self["entries"] = ConfigList([ ])
-		self.listtype = TYPE_CONFIG
 
 		self["actions"] = NumberActionMap(["SetupActions"],
 			{
@@ -56,12 +55,7 @@ class CiMmi(Screen):
 
 		self.action = action
 
-		if action == 0:			#reset
-			eDVBCI_UI.getInstance().setReset(self.slotid)
-			self.showWait()
-		elif action == 1:		#init
-			eDVBCI_UI.getInstance().setInit(self.slotid)
-		elif action == 2:		#start MMI
+		if action == 2:		#start MMI
 			eDVBCI_UI.getInstance().startMMI(self.slotid)
 			self.showWait()
 		elif action == 3:		#mmi already there (called from infobar)
@@ -69,47 +63,55 @@ class CiMmi(Screen):
 
 	def addEntry(self, list, entry):
 		if entry[0] == "TEXT":		#handle every item (text / pin only?)
-			list.append( (entry[1], entry[2]) )
+			list.append( (entry[1], ConfigNothing(), entry[2]) )
 		if entry[0] == "PIN":
-			self.pinlength = entry[1]
+			pinlength = entry[1]
 			if entry[3] == 1:
 				# masked pins:
-				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "*")))
-			else:				
+				x = ConfigPIN(0, len = pinlength, censor = "*")
+			else:
 				# unmasked pins:
-				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "")))
+				x = ConfigPIN(0, len = pinlength)
 			self["subtitle"].setText(entry[2])
-			self.pin = getConfigListEntry("",x)
-			list.append( self.pin )
+			list.append( getConfigListEntry("", x) )
 			self["bottom"].setText(_("please press OK when ready"))
 
 	def okbuttonClick(self):
-		print "ok"
+		self.timer.stop()
+		if not self.tag:
+			return
 		if self.tag == "WAIT":
 			print "do nothing - wait"
 		elif self.tag == "MENU":
 			print "answer MENU"
-			eDVBCI_UI.getInstance().answerMenu(self.slotid, self["entries"].getCurrent()[1])
+			cur = self["entries"].getCurrent()
+			if cur:
+				eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[2])
+			else:
+				eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
 			self.showWait()	
 		elif self.tag == "LIST":
 			print "answer LIST"
 			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
 			self.showWait()	
 		elif self.tag == "ENQ":
-			answer = str(self.pin[1].parent.value[0])
+			cur = self["entries"].getCurrent()
+			answer = str(cur[1].value)
 			length = len(answer)
-			while length < self.pinlength:
+			while length < cur[1].getLength():
 				answer = '0'+answer
 				length+=1
 			eDVBCI_UI.getInstance().answerEnq(self.slotid, answer)
 			self.showWait()
 
 	def closeMmi(self):
-		self.Timer.stop()
-		self.close()
+		self.timer.stop()
+		self.close(self.slotid)
 
 	def keyCancel(self):
-		print "keyCancel"
+		self.timer.stop()
+		if not self.tag:
+			return
 		if self.tag == "WAIT":
 			eDVBCI_UI.getInstance().stopMMI(self.slotid)
 			self.closeMmi()
@@ -124,46 +126,40 @@ class CiMmi(Screen):
 		else:
 			print "give cancel action to ci"	
 
+	def keyConfigEntry(self, key):
+		self.timer.stop()
+		try:
+			self["entries"].handleKey(key)
+		except:
+			pass
+
 	def keyNumberGlobal(self, number):
-		self["entries"].handleKey(config.key[str(number)])
+		self.timer.stop()
+		self.keyConfigEntry(KEY_0 + number)
 
 	def keyLeft(self):
-		self["entries"].handleKey(config.key["prevElement"])
+		self.timer.stop()
+		self.keyConfigEntry(KEY_LEFT)
 
 	def keyRight(self):
-		self["entries"].handleKey(config.key["nextElement"])
+		self.timer.stop()
+		self.keyConfigEntry(KEY_RIGHT)
 
 	def updateList(self, list):
 		List = self["entries"]
 		try:
 			List.instance.moveSelectionTo(0)
 		except:
-			List.l.setList(list)
-			return
-
-		if self.tag == "ENQ":
-			type = TYPE_CONFIG
-		else:
-			type = TYPE_MENU
-
-		if type != self.listtype:
-			if type == TYPE_CONFIG:
-				List.l = eListboxPythonConfigContent()
-			else:
-				List.l = eListboxPythonStringContent()
-			List.instance.setContent(List.l)
-			self.listtype = type
-
+			pass
 		List.l.setList(list)
 
-
 	def showWait(self):
 		self.tag = "WAIT"
 		self["title"].setText("")
 		self["subtitle"].setText("")
 		self["bottom"].setText("")
 		list = [ ]
-		list.append( ("wait for ci...", 0) )
+		list.append( (_("wait for ci..."), ConfigNothing()) )
 		self.updateList(list)
 
 	def showScreen(self):
@@ -171,23 +167,30 @@ class CiMmi(Screen):
 	
 		list = [ ]
 
-		self.tag = screen[0][0]
-
-		for entry in screen:
-			if entry[0] == "PIN":
-				self.addEntry(list, entry)
+		self.timer.stop()
+		if len(screen) > 0 and screen[0][0] == "CLOSE":
+			timeout = screen[0][1]
+			if timeout > 0:
+				self.timer.start(timeout*1000, True)
 			else:
-				if entry[0] == "TITLE":
-					self["title"].setText(entry[1])
-				elif entry[0] == "SUBTITLE":
-					self["subtitle"].setText(entry[1])
-				elif entry[0] == "BOTTOM":
-					self["bottom"].setText(entry[1])
-				elif entry[0] == "TEXT":
+				self.keyCancel()
+		else:
+			self.tag = screen[0][0]
+			for entry in screen:
+				if entry[0] == "PIN":
 					self.addEntry(list, entry)
-		self.updateList(list)
-
-	def TimerCheck(self):
+				else:
+					if entry[0] == "TITLE":
+						self["title"].setText(entry[1])
+					elif entry[0] == "SUBTITLE":
+						self["subtitle"].setText(entry[1])
+					elif entry[0] == "BOTTOM":
+						self["bottom"].setText(entry[1])
+					elif entry[0] == "TEXT":
+						self.addEntry(list, entry)
+			self.updateList(list)
+
+	def ciStateChanged(self):
 		if self.action == 0:			#reset
 			self.closeMmi()
 		if self.action == 1:			#init
@@ -200,70 +203,159 @@ class CiMmi(Screen):
 		#mmi session still active ?			
 		if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1:
 			self.closeMmi()
-			
-		#new screen available?	
-		if eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1:
+
+		if self.action > 1 and eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1:
 			self.showScreen()
-			
+
 		#FIXME: check for mmi-session closed	
 
-class CiSelection(Screen):
-	def createMenu(self):
-		self.list = [ ]
-		self.list.append( (_("Reset"), 0) )
-		self.list.append( (_("Init"), 1) )
-		
-		self.state = eDVBCI_UI.getInstance().getState(0)
-		if self.state == 0:			#no module
-			self.list.append( (_("no module found"), 2) )
-		elif self.state == 1:		#module in init
-			self.list.append( (_("init module"), 2) )
-		elif self.state == 2:		#module ready
-			#get appname		
-			appname = eDVBCI_UI.getInstance().getAppName(0)
-			self.list.append( (appname, 2) )
-
-		self["entries"].list = self.list
-		self["entries"].l.setList(self.list)
-
-	def TimerCheck(self):
-		state = eDVBCI_UI.getInstance().getState(0)
-		if self.state != state:
-			#print "something happens"
-			self.state = state
-			self.createMenu()
-	
-	def okbuttonClick(self):
-		self.slot = 0
-	
-		if self.state == 2:
-			self.session.open(CiMmi, 0, self["entries"].getCurrent()[1])
+class CiMessageHandler:
+	def __init__(self):
+		self.session = None
+		self.ci = { }
+		self.dlgs = { }
+		eDVBCI_UI.getInstance().ciStateChanged.get().append(self.ciStateChanged)
 
-		#generate menu / list
-		#list = [ ]
-		#list.append( ("TEXT", "CA-Info") )
-		#list.append( ("TEXT", "Card Status") )
-		#list.append( ("PIN", 6, "Card Pin", 1) )
-		#self.session.open(CiMmi, 0, 0, "Wichtiges CI", "Mainmenu", "Footer", list)
+	def setSession(self, session):
+		self.session = session
 
-	def cancel(self):
-		self.Timer.stop()
-		self.close()
-		
+	def ciStateChanged(self, slot):
+		if slot in self.ci:
+			self.ci[slot](slot)
+		else:
+			if slot in self.dlgs:
+				self.dlgs[slot].ciStateChanged()
+			elif eDVBCI_UI.getInstance().availableMMI(slot) == 1:
+				if self.session:
+					self.dlgs[slot] = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, 3)
+
+	def dlgClosed(self, slot):
+		if slot in self.dlgs:
+			del self.dlgs[slot]
+
+	def registerCIMessageHandler(self, slot, func):
+		self.unregisterCIMessageHandler(slot)
+		self.ci[slot] = func
+
+	def unregisterCIMessageHandler(self, slot):
+		if slot in self.ci:
+			del self.ci[slot]
+
+CiHandler = CiMessageHandler()
+
+class CiSelection(Screen):
 	def __init__(self, session):
-		#FIXME support for one ci only
 		Screen.__init__(self, session)
-		
-		self["actions"] = ActionMap(["OkCancelActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "CiSelectionActions"],
 			{
+				"left": self.keyLeft,
+				"right": self.keyLeft,
 				"ok": self.okbuttonClick,
 				"cancel": self.cancel
-			})
+			},-1)
 
+		self.dlg = None
+		self.state = { }
 		self.list = [ ]
-		self["entries"] = MenuList(list)
-		self.createMenu()
 
-		self.Timer = eTimer()
-		self.Timer.timeout.get().append(self.TimerCheck)
-		self.Timer.start(1000)
+		for slot in range(MAX_NUM_CI):
+			state = eDVBCI_UI.getInstance().getState(slot)
+			if state != -1:
+				self.appendEntries(slot, state)
+				CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
+
+		menuList = ConfigList(self.list)
+		menuList.list = self.list
+		menuList.l.setList(self.list)
+		self["entries"] = menuList
+		self["entries"].onSelectionChanged.append(self.selectionChanged)
+		self["text"] = Label(_("Slot %d")%(1))
+
+	def selectionChanged(self):
+		cur_idx = self["entries"].getCurrentIndex()
+		self["text"].setText(_("Slot %d")%((cur_idx / 4)+1))
+
+	def keyConfigEntry(self, key):
+		try:
+			self["entries"].handleKey(key)
+			self["entries"].getCurrent()[1].save()
+		except:
+			pass
+
+	def keyLeft(self):
+		self.keyConfigEntry(KEY_LEFT)
+
+	def keyRight(self):
+		self.keyConfigEntry(KEY_RIGHT)
+
+	def appendEntries(self, slot, state):
+		self.state[slot] = state
+		self.list.append( (_("Reset"), ConfigNothing(), 0, slot) )
+		self.list.append( (_("Init"), ConfigNothing(), 1, slot) )
+
+		if self.state[slot] == 0:			#no module
+			self.list.append( (_("no module found"), ConfigNothing(), 2, slot) )
+		elif self.state[slot] == 1:		#module in init
+			self.list.append( (_("init module"), ConfigNothing(), 2, slot) )
+		elif self.state[slot] == 2:		#module ready
+			#get appname
+			appname = eDVBCI_UI.getInstance().getAppName(slot)
+			self.list.append( (appname, ConfigNothing(), 2, slot) )
+
+		self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
+
+	def updateState(self, slot):
+		state = eDVBCI_UI.getInstance().getState(slot)
+		self.state[slot] = state
+
+		slotidx=0
+		while len(self.list[slotidx]) < 3 or self.list[slotidx][3] != slot:
+			slotidx += 1
+
+		slotidx += 1 # do not change Reset
+		slotidx += 1 # do not change Init
+
+		if state == 0:			#no module
+			self.list[slotidx] = (_("no module found"), ConfigNothing(), 2, slot)
+		elif state == 1:		#module in init
+			self.list[slotidx] = (_("init module"), ConfigNothing(), 2, slot)
+		elif state == 2:		#module ready
+			#get appname
+			appname = eDVBCI_UI.getInstance().getAppName(slot)
+			self.list[slotidx] = (appname, ConfigNothing(), 2, slot)
+
+		lst = self["entries"]
+		lst.list = self.list
+		lst.l.setList(self.list)
+
+	def ciStateChanged(self, slot):
+		if self.dlg:
+			self.dlg.ciStateChanged()
+		else:
+			state = eDVBCI_UI.getInstance().getState(slot)
+			if self.state[slot] != state:
+				#print "something happens"
+				self.state[slot] = state
+				self.updateState(slot)
+
+	def dlgClosed(self, slot):
+		self.dlg = None
+
+	def okbuttonClick(self):
+		cur = self["entries"].getCurrent()
+		if cur and len(cur) > 2:
+			action = cur[2]
+			slot = cur[3]
+			if action == 0:		#reset
+				eDVBCI_UI.getInstance().setReset(slot)
+			elif action == 1:		#init
+				eDVBCI_UI.getInstance().setInit(slot)
+			elif self.state[slot] == 2:
+				self.dlg = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, action)
+
+	def cancel(self):
+		for slot in range(MAX_NUM_CI):
+			state = eDVBCI_UI.getInstance().getState(slot)
+			if state != -1:
+				CiHandler.unregisterCIMessageHandler(slot)
+		self.close()