X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8b2ce4053356148321c32551dd86234073f0c192..350338b92543c7753db8753dca89adb885d30e9b:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 8443079e..19ee474b 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -10,7 +10,78 @@ from Components.HTMLComponent import *
 from Components.GUIComponent import *
 from Components.config import *
 
-from enigma import eListbox, eListboxPythonConfigContent
+from enigma import *
+
+#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()
+
+	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):
+		Screen.__init__(self, session)
+
+		self["message"] = Label(_("waiting for CI..."))
+
+		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):
@@ -33,7 +104,6 @@ class CiEntryList(HTMLComponent, GUIComponent):
 			self.invalidateCurrent()
 		except:	
 			pass	
-			
 
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
@@ -53,18 +123,53 @@ class CiEntryList(HTMLComponent, GUIComponent):
 		self.instance = None
 
 class CiMmi(Screen):
-	def addEntry(self, list, entry, index):
+	def addEntry(self, list, entry):
 		if entry[0] == "TEXT":		#handle every item (text / pin only?)
-			list.append( (entry[1], index) )
+			list.append( (entry[1], entry[2]) )
 		if entry[0] == "PIN":
-			# masked pins:
-			x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "-")))
-			# unmasked pins:
-			# x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))			
-			list.append( getConfigListEntry(entry[2],x) )
+			if entry[3] == 1:
+				# masked pins:
+				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "-")))
+			else:				
+				# unmasked pins:
+				x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))			
+				
+			self.pin = getConfigListEntry(entry[2],x)
+			list.append( self.pin )
+
+	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
+		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
+		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):
-		print "actual:" + str(self["entries"].getCurrentIndex())
+		self.closeMMI(0)
+
+	def keyCancel(self):
+		print "keyCancel"
+		self.closeMMI(1)
 
 	def keyNumberGlobal(self, number):
 		self["entries"].handleKey(config.key[str(number)])
@@ -75,23 +180,32 @@ class CiMmi(Screen):
 	def keyRight(self):
 		self["entries"].handleKey(config.key["nextElement"])
 
-	def keyCancel(self):
-		print "keyCancel"
-		self.close()
-		
-	def __init__(self, session, slotid, title, subtitle, bottom, entries):
+	def __init__(self, session, parent, slotid, appname, entries):
 		Screen.__init__(self, session)
 
+		self.parent = parent
 		self.slotid = slotid
-		self["title"] = Label(title)
-		self["subtitle"] = Label(subtitle)
-		self["bottom"] = Label(bottom)
-				
+		self.tag = entries[0][0]
+		
+		#else the skins fails
+		self["title"] = Label("")
+		self["subtitle"] = Label("")
+		self["bottom"] = Label("")
+
 		list = [ ]
-		cnt = 0
+		
 		for entry in entries:
-			self.addEntry(list, entry, cnt)
-			cnt = cnt + 1
+			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"],
@@ -113,23 +227,74 @@ class CiMmi(Screen):
 				"0": self.keyNumberGlobal
 			}, -1)
 
+
 class CiSelection(Screen):
-	def okbuttonClick(self):
+	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()
 	
-		if self["entries"].getCurrent()[1] == 0:		#reset
-			print "ci reset requested"
-			pass
-		if self["entries"].getCurrent()[1] == 1:		#init
-			print "ci init requested"
+	def ciWaitAnswer(self):
+		#FIXME: handling for correct slot
+		#print "ciWaitAnswer with self.mmistate = " + str(self.mmistate)
+
+		if self.mmistate == 0:		
+			#print "do nothing"
 			pass
-		if self["entries"].getCurrent()[1] == 2:		#mmi open
-			#ci->getInstance().mmiOpen() and wait for list of elments ???
-			#generate menu / list
-			list = [ ]
-			list.append( ("TEXT", "CA-Info") )
-			list.append( ("TEXT", "Card Status") )
-			list.append( ("PIN", 6, "Card Pin") )
-			self.session.open(CiMmi, 0, "Wichtiges CI", "Mainmenu", "Footer", list)
+		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()
+
+		#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 cancel(self):
+		self.Timer.stop()
+		self.close()
 		
 	def __init__(self, session):
 		#FIXME support for one ci only
@@ -138,12 +303,13 @@ class CiSelection(Screen):
 		self["actions"] = ActionMap(["OkCancelActions"], 
 			{
 				"ok": self.okbuttonClick,
-				"cancel": self.close
+				"cancel": self.cancel
 			})
-			
-		list = [ ]
-		list.append( ("Reset", 0) )	
-		list.append( ("Init", 1) )	
-		#add timer for "app-manager name" ?
-		list.append( ("Irdeto Blasel SE", 2) )	
+
+		self.list = [ ]
 		self["entries"] = CiEntryList(list)
+		self.createMenu()
+
+		self.Timer = eTimer()
+		self.Timer.timeout.get().append(self.TimerCheck)
+		self.Timer.start(1000)