X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8b2ce4053356148321c32551dd86234073f0c192..9925392e576717cc0df070ace822a6f392808bb7:/lib/python/Screens/Ci.py diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index 8443079e..fe34f4aa 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -10,7 +10,49 @@ 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 TimerCheck(self): + #special cases to prevent to fast resets/inits + if self.lastQuery == 0: + self.cancel() + elif self.lastQuery == 1: + self.cancel() + + def __init__(self, session, slot, query): + Screen.__init__(self, session) + + self["message"] = Label("waiting for CI...") + + self["actions"] = ActionMap(["OkCancelActions"], + { + "cancel": self.cancel + }) + + self.lastQuery = query + + self.Timer = eTimer() + self.Timer.timeout.get().append(self.TimerCheck) + + if query == 0: #reset + self.Timer.start(1000) #block 1 second + print "reset" + eDVBCI_UI.getInstance().setReset(0) + if query == 1: #init + self.Timer.start(1000) #block 1 second + print "init" + if query == 2: #mmi-open + print "mmi open" + if query == 3: #mmi-answer + print "mmi answer" + class CiEntryList(HTMLComponent, GUIComponent): def __init__(self, list): @@ -33,7 +75,6 @@ class CiEntryList(HTMLComponent, GUIComponent): self.invalidateCurrent() except: pass - def getCurrent(self): return self.l.getCurrentSelection() @@ -57,14 +98,27 @@ class CiMmi(Screen): if entry[0] == "TEXT": #handle every item (text / pin only?) list.append( (entry[1], index) ) 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 okbuttonClick(self): - print "actual:" + str(self["entries"].getCurrentIndex()) + if self.tag == 0: #ENQ + print "enq- answer pin:" + str(self.pin[1].parent.value[0]) + #ci[self.slotid]->getInstance().mmiEnqAnswer(self.pin[1].parent.value[0]) + elif self.tag == 1: #Menu + print "answer - actual:" + str(self["entries"].getCurrentIndex()) + #ci[self.slotid]->getInstance().mmiAnswer(self["entries"].getCurrentIndex()) + elif self.tag == 2: #List + print "answer on List - send 0" + #ci[self.slotid]->getInstance().mmiAnswer(0) + self.close() def keyNumberGlobal(self, number): self["entries"].handleKey(config.key[str(number)]) @@ -79,10 +133,12 @@ class CiMmi(Screen): print "keyCancel" self.close() - def __init__(self, session, slotid, title, subtitle, bottom, entries): + #tag is 0=ENQ 1=Menu 2=List + def __init__(self, session, slotid, tag, title, subtitle, bottom, entries): Screen.__init__(self, session) self.slotid = slotid + self.tag = tag self["title"] = Label(title) self["subtitle"] = Label(subtitle) self["bottom"] = Label(bottom) @@ -113,23 +169,48 @@ 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" - 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) + def okbuttonClick(self): + if self.state == 2: + #FIXME: find out the correct slot + self.session.open(CiWait, 0, self["entries"].getCurrent()[1]) + + #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 +219,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)