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.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)
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], "")))
-
+ 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 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[1])
+ else:
+ eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
self.showWait()
elif self.tag == "LIST":
print "answer LIST"
self.showWait()
elif self.tag == "ENQ":
answer = str(self.pin[1].parent.value[0])
- print "answer ENQ", answer
+ 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.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()
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 updateList(self, list):
List = self["entries"]
List.l.setList(list)
return
- if self.tag == "ENQ":
+ if self.tag and self.tag == "ENQ":
type = TYPE_CONFIG
else:
type = TYPE_MENU
List.l.setList(list)
-
def showWait(self):
self.tag = "WAIT"
self["title"].setText("")
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
#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)
+ else:
+ print "no session"
+
+ def dlgClosed(self, slot):
+ 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"],
{
"ok": self.okbuttonClick,
"cancel": self.cancel
})
+ 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(4):
+ state = eDVBCI_UI.getInstance().getState(slot)
+ self.appendEntries(slot, state) # FIXME more than one CI
+ CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
+
+ menuList = MenuList(list)
+ menuList.list = self.list
+ menuList.l.setList(self.list)
+ self["entries"] = menuList
+
+ 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) )
+
+ 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:
+ 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()
git.cweiske.de / enigma2.git / blobdiff