X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FCi.py;h=b516ec70a3781eab9fb49deabce2563a012e6f85;hp=19ee474b1fb1f5695f1954939f8abb417e830bd7;hb=0d8132d3512dbf77d817aa8fb6684384155b642e;hpb=7c16be8e93f046eda8f3e63d7633023ed2590fc5

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 19ee474..b516ec7 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -9,307 +9,369 @@ from Components.Label import Label
 from Components.HTMLComponent import *
 from Components.GUIComponent import *
 from Components.config import *
+from Components.ConfigList import ConfigList
 
-from enigma import *
+from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
 
-#use this class to synchronize all ci to/from user communications
-class CiWait(Screen):
-	def cancel(self):
-		#stop pending requests
-		self.Timer.stop()
-		self.close()
+TYPE_MENU = 0
+TYPE_CONFIG = 1
+MAX_NUM_CI = 4
 
-	def Keycancel(self):
-		if self.lastQuery >= 2:
-			eDVBCI_UI.getInstance().stopMMI(self.slot)
-		self.parent.mmistate = 0
-		self.cancel()
-
-	def TimerCheck(self):
-		#special cases to prevent to fast resets/inits
-		if self.lastQuery == 0:			#reset requested
-			self.Keycancel()
-		elif self.lastQuery == 1:		#init requested
-			self.Keycancel()
-		elif self.lastQuery == 4:		#close requested
-			self.Keycancel()
-		else:
-			if eDVBCI_UI.getInstance().getState(self.slot) != 2:	#module removed
-				self.Keycancel()
-			else:	
-				if eDVBCI_UI.getInstance().availableMMI(self.slot) == 1:	#data?
-					self.parent.mmistate = 2	#request screen
-					self.cancel()
-
-	def __init__(self, session, parent, slot, query):
+def InitCiConfig():
+	config.ci = [ ]
+	for slot in range(MAX_NUM_CI):
+		config.ci.append(ConfigSubsection())
+		config.ci[slot].canDescrambleMultipleServices = configElement("config.ci%d.canDescrambleMultipleServices"%(slot), configSelection, 0, (("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))))
+
+class CiMmi(Screen):
+	def __init__(self, session, slotid, action):
 		Screen.__init__(self, session)
 
-		self["message"] = Label(_("waiting for CI..."))
+		print "ciMMI with action" + str(action)
 
-		self["actions"] = ActionMap(["OkCancelActions"], 
-			{
-				"cancel": self.Keycancel
-			})
-		
-		self.parent = parent	
-		self.lastQuery = query
-		self.slot = slot
-
-		self.Timer = eTimer()
-		self.Timer.timeout.get().append(self.TimerCheck)
-		self.Timer.start(1000)					#check and block 1 second
-
-		if query == 0:									#reset
-			#print "reset"
-			eDVBCI_UI.getInstance().setReset(slot)
-		if query == 1:									#init
-			#print "init"
-			eDVBCI_UI.getInstance().initialize(slot)
-		if query == 2:									#mmi-open
-			#print "mmi open"
-			eDVBCI_UI.getInstance().startMMI(slot)
-		if query == 3:									#mmi-answer
-			#print "mmi answer"
-			if self.parent.answertype == 0: #ENQ
-				eDVBCI_UI.getInstance().answerEnq(slot, self.parent.answertype, self.parent.answer)
-			elif self.parent.answertype == 1: #ENQ cancel
-				eDVBCI_UI.getInstance().answerEnq(slot, self.parent.answertype, "")
-			elif self.parent.answertype == 2: #Menu
-				eDVBCI_UI.getInstance().answerMenu(slot, self.parent.answer)
-			elif self.parent.answertype == 3: #List
-				eDVBCI_UI.getInstance().answerMenu(slot, self.parent.answer)
-		if query == 4:									#mmi-close
-			#print "mmi close"
-			pass
-			
-
-class CiEntryList(HTMLComponent, GUIComponent):
-	def __init__(self, list):
-		GUIComponent.__init__(self)
-		self.l = eListboxPythonConfigContent()
-		self.l.setList(list)
-		self.l.setSeperation(100)
-		self.list = list
-
-	def toggle(self):
-		selection = self.getCurrent()
-		selection[1].toggle()
-		self.invalidateCurrent()
-
-	def handleKey(self, key):
-		#not every element got an .handleKey
-		try:
-			selection = self.getCurrent()
-			selection[1].handleKey(key)
-			self.invalidateCurrent()
-		except:	
-			pass	
+		self.tag = None
+		self.slotid = slotid
 
-	def getCurrent(self):
-		return self.l.getCurrentSelection()
+		self.timer = eTimer()
+		self.timer.timeout.get().append(self.keyCancel)
 
-	def getCurrentIndex(self):
-		return self.l.getCurrentSelectionIndex()
+		#else the skins fails
+		self["title"] = Label("")
+		self["subtitle"] = Label("")
+		self["bottom"] = Label("")
+		self["entries"] = ConfigList([ ])
+		self.listtype = TYPE_CONFIG
 
-	def invalidateCurrent(self):
-		self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
+		self["actions"] = NumberActionMap(["SetupActions"],
+			{
+				"ok": self.okbuttonClick,
+				"cancel": self.keyCancel,
+				#for PIN
+				"left": self.keyLeft,
+				"right": self.keyRight,
+				"1": self.keyNumberGlobal,
+				"2": self.keyNumberGlobal,
+				"3": self.keyNumberGlobal,
+				"4": self.keyNumberGlobal,
+				"5": self.keyNumberGlobal,
+				"6": self.keyNumberGlobal,
+				"7": self.keyNumberGlobal,
+				"8": self.keyNumberGlobal,
+				"9": self.keyNumberGlobal,
+				"0": self.keyNumberGlobal
+			}, -1)
 
-	def GUIcreate(self, parent):
-		self.instance = eListbox(parent)
-		self.instance.setContent(self.l)
+		self.action = action
 
-	def GUIdelete(self):
-		self.instance.setContent(None)
-		self.instance = None
+		if action == 2:		#start MMI
+			eDVBCI_UI.getInstance().startMMI(self.slotid)
+			self.showWait()
+		elif action == 3:		#mmi already there (called from infobar)
+			self.showScreen()
 
-class CiMmi(Screen):
 	def addEntry(self, list, entry):
 		if entry[0] == "TEXT":		#handle every item (text / pin only?)
 			list.append( (entry[1], entry[2]) )
 		if entry[0] == "PIN":
+			self.pinlength = entry[1]
 			if entry[3] == 1:
 				# masked pins:
-				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "-")))
+				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "*")))
 			else:				
 				# unmasked pins:
-				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))			
-				
-			self.pin = getConfigListEntry(entry[2],x)
+				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "")))
+			self["subtitle"].setText(entry[2])
+			self.pin = getConfigListEntry("",x)
 			list.append( self.pin )
+			self["bottom"].setText(_("please press OK when ready"))
 
-	def closeMMI(self, cancel):
-		if self.tag == "ENQ":
-			#print "enq- answer pin:" +  str(self.pin[1].parent.value[0])
-			if cancel == 0:
-				self.parent.answertype = 0
-				self.parent.answer = str(self.pin[1].parent.value[0])
-			else:	
-				self.parent.answertype = 1
-				self.parent.answer = 0
+	def okbuttonClick(self):
+		self.timer.stop()
+		if not self.tag:
+			return
+		if self.tag == "WAIT":
+			print "do nothing - wait"
 		elif self.tag == "MENU":
-			#print "answer - actual:" + str(self["entries"].getCurrent()[1])
-			self.parent.answertype = 2
-			if cancel == 0:
-				self.parent.answer = self["entries"].getCurrent()[1]
-			else:	
-				self.parent.answer = 0
+			print "answer MENU"
+			cur = self["entries"].getCurrent()
+			if cur:
+				eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[1])
+			else:
+				eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
+			self.showWait()	
 		elif self.tag == "LIST":
-			#print "answer on List"
-			self.parent.answertype = 3
-			if cancel == 0:
-				self.parent.answer = self["entries"].getCurrent()[1]
-			else:	
-				self.parent.answer = 0
-
-		self.parent.mmistate = 4	#request wait
-		self.close()
-
-	def okbuttonClick(self):
-		self.closeMMI(0)
+			print "answer LIST"
+			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
+			self.showWait()	
+		elif self.tag == "ENQ":
+			answer = str(self.pin[1].parent.value[0])
+			length = len(answer)
+			while length < self.pinlength:
+				answer = '0'+answer
+				length+=1
+			eDVBCI_UI.getInstance().answerEnq(self.slotid, answer)
+			self.showWait()
+
+	def closeMmi(self):
+		self.timer.stop()
+		self.close(self.slotid)
 
 	def keyCancel(self):
-		print "keyCancel"
-		self.closeMMI(1)
+		self.timer.stop()
+		if not self.tag:
+			return
+		if self.tag == "WAIT":
+			eDVBCI_UI.getInstance().stopMMI(self.slotid)
+			self.closeMmi()
+		elif self.tag in [ "MENU", "LIST" ]:
+			print "cancel list"
+			eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
+			self.showWait()
+		elif self.tag == "ENQ":
+			print "cancel enq"
+			eDVBCI_UI.getInstance().cancelEnq(self.slotid)
+			self.showWait()
+		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(config.key[str(number)])
 
 	def keyLeft(self):
-		self["entries"].handleKey(config.key["prevElement"])
+		self.timer.stop()
+		self.keyConfigEntry(config.key["prevElement"])
 
 	def keyRight(self):
-		self["entries"].handleKey(config.key["nextElement"])
+		self.timer.stop()
+		self.keyConfigEntry(config.key["nextElement"])
 
-	def __init__(self, session, parent, slotid, appname, entries):
-		Screen.__init__(self, session)
+	def updateList(self, list):
+		List = self["entries"]
+		try:
+			List.instance.moveSelectionTo(0)
+		except:
+			List.l.setList(list)
+			return
 
-		self.parent = parent
-		self.slotid = slotid
-		self.tag = entries[0][0]
-		
-		#else the skins fails
-		self["title"] = Label("")
-		self["subtitle"] = Label("")
-		self["bottom"] = Label("")
+		if self.tag and 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
+
+		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) )
+		self.updateList(list)
 
+	def showScreen(self):
+		screen = eDVBCI_UI.getInstance().getMMIScreen(self.slotid)
+	
 		list = [ ]
-		
-		for entry in entries:
-			if entry[0] == "TITLE":
-				self["title"] = Label(entry[1])
-			elif entry[0] == "SUBTITLE":
-				self["subtitle"] = Label(entry[1])
-			elif entry[0] == "BOTTOM":
-				self["bottom"] = Label(entry[1])				
-			elif entry[0] == "TEXT":
-				self.addEntry(list, entry)
-			elif entry[0] == "PIN":
-				self.addEntry(list, entry)
-
-		self["entries"] = CiEntryList(list)
 
-		self["actions"] = NumberActionMap(["SetupActions"],
-			{
-				"ok": self.okbuttonClick,
-				"cancel": self.keyCancel,
-				#for PIN
-				"left": self.keyLeft,
-				"right": self.keyRight,
-				"1": self.keyNumberGlobal,
-				"2": self.keyNumberGlobal,
-				"3": self.keyNumberGlobal,
-				"4": self.keyNumberGlobal,
-				"5": self.keyNumberGlobal,
-				"6": self.keyNumberGlobal,
-				"7": self.keyNumberGlobal,
-				"8": self.keyNumberGlobal,
-				"9": self.keyNumberGlobal,
-				"0": self.keyNumberGlobal
-			}, -1)
+		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:
+				self.keyCancel()
+		else:
+			self.tag = screen[0][0]
+			for entry in screen:
+				if entry[0] == "PIN":
+					self.addEntry(list, entry)
+				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
+			self.closeMmi()
+
+		#module still there ?			
+		if eDVBCI_UI.getInstance().getState(self.slotid) != 2:
+			self.closeMmi()
+
+		#mmi session still active ?			
+		if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1:
+			self.closeMmi()
+
+		if self.action > 1 and eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1:
+			self.showScreen()
+
+		#FIXME: check for mmi-session closed	
+
+class CiMessageHandler:
+	def __init__(self):
+		self.session = None
+		self.ci = { }
+		self.dlgs = { }
+		eDVBCI_UI.getInstance().ciStateChanged.get().append(self.ciStateChanged)
+
+	def setSession(self, session):
+		self.session = session
+
+	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)
+				else:
+					print "no session"
 
+	def dlgClosed(self, slot):
+		del self.dlgs[slot]
 
-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 ciWaitAnswer(self):
-		#FIXME: handling for correct slot
-		#print "ciWaitAnswer with self.mmistate = " + str(self.mmistate)
+	def registerCIMessageHandler(self, slot, func):
+		self.unregisterCIMessageHandler(slot)
+		self.ci[slot] = func
 
-		if self.mmistate == 0:		
-			#print "do nothing"
-			pass
-		elif self.mmistate == 1:			#wait requested
-			#print "wait requested"
-			self.session.openWithCallback(self.ciWaitAnswer, CiWait, self, 0, self["entries"].getCurrent()[1])
-		elif self.mmistate == 2:			#open screen requested
-			#print "open screen requested"
-			self.answertype = -1
-			self.answer = ""
-			appname = eDVBCI_UI.getInstance().getAppName(0)
-			list = eDVBCI_UI.getInstance().getMMIScreen(self.slot)
-			self.session.openWithCallback(self.ciWaitAnswer, CiMmi, self, self.slot, appname, list)
-		elif self.mmistate == 3:			#close mmi requested
-			#print "close mmi requested"
-			self.session.openWithCallback(self.ciWaitAnswer, CiWait, self, 0, 4)
-		elif self.mmistate == 4:			#mmi answer requested
-			#print "mmi answer requested"
-			self.session.openWithCallback(self.ciWaitAnswer, CiWait, self, 0, 3)
-		
-	def okbuttonClick(self):
-		self.slot = 0
-	
-		if self.state == 2:
-			self.mmistate = 1
-			self.ciWaitAnswer()
+	def unregisterCIMessageHandler(self, slot):
+		if slot in self.ci:
+			del self.ci[slot]
 
-		#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)
+CiHandler = CiMessageHandler()
 
-	def cancel(self):
-		self.Timer.stop()
-		self.close()
-		
+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"] = CiEntryList(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(list)
+		menuList.list = self.list
+		menuList.l.setList(self.list)
+		self["entries"] = menuList
+
+	def keyConfigEntry(self, key):
+		try:
+			self["entries"].handleKey(key)
+			self["entries"].getCurrent()[1].save()
+		except:
+			pass
+
+	def keyLeft(self):
+		self.keyConfigEntry(config.key["prevElement"])
+
+	def keyRight(self):
+		self.keyConfigEntry(config.key["nextElement"])
+
+	def appendEntries(self, slot, state):
+		self.state[slot] = state
+		self.list.append( (_("Reset"), 0, slot) )
+		self.list.append( (_("Init"), 1, slot) )
+
+		if self.state[slot] == 0:			#no module
+			self.list.append( (_("no module found"), 2, slot) )
+		elif self.state[slot] == 1:		#module in init
+			self.list.append( (_("init module"), 2, slot) )
+		elif self.state[slot] == 2:		#module ready
+			#get appname
+			appname = eDVBCI_UI.getInstance().getAppName(slot)
+			self.list.append( (appname, 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 self.list[slotidx][2] != 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"), 2, slot)
+		elif state == 1:		#module in init
+			self.list[slotidx] = (_("init module"), 2, slot)
+		elif state == 2:		#module ready
+			#get appname
+			appname = eDVBCI_UI.getInstance().getAppName(slot)
+			self.list[slotidx] = (appname, 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[1]
+			slot = cur[2]
+			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):
+		CiHandler.unregisterCIMessageHandler(0)
+		self.close()