make file extensions case insensitive in mediaplayer and servicefs

[enigma2.git] / lib / python / Screens / Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index f65935519800237539109ed637a598a9c91c534c..b3653d214c2a5a95f620bdacd4bf3e7ed375667a 100644 (file)
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -22,11 +22,11 @@ class CiMmi(Screen):
 
                print "ciMMI with action" + str(action)
 
 
                print "ciMMI with action" + str(action)
 

+               self.tag = None

                self.slotid = slotid
 
                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("")
 
                #else the skins fails
                self["title"] = Label("")


@@ -56,12 +56,7 @@ class CiMmi(Screen):
 
                self.action = action
 
 
                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)
                        eDVBCI_UI.getInstance().startMMI(self.slotid)
                        self.showWait()
                elif action == 3:               #mmi already there (called from infobar)


@@ -71,25 +66,31 @@ class CiMmi(Screen):
                if entry[0] == "TEXT":          #handle every item (text / pin only?)
                        list.append( (entry[1], entry[2]) )
                if entry[0] == "PIN":
                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:
                        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:
                        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):
                        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"
                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 == "LIST":
                        print "answer LIST"


@@ -97,16 +98,21 @@ class CiMmi(Screen):
                        self.showWait() 
                elif self.tag == "ENQ":
                        answer = str(self.pin[1].parent.value[0])
                        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):
                        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):
 
        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()
                if self.tag == "WAIT":
                        eDVBCI_UI.getInstance().stopMMI(self.slotid)
                        self.closeMmi()


@@ -121,14 +127,24 @@ class CiMmi(Screen):
                else:
                        print "give cancel action to ci"        
 
                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):
        def keyNumberGlobal(self, number):

-               self["entries"].handleKey(config.key[str(number)])
+               self.timer.stop()
+               self.keyConfigEntry(config.key[str(number)])

 
        def keyLeft(self):
 
        def keyLeft(self):

-               self["entries"].handleKey(config.key["prevElement"])
+               self.timer.stop()
+               self.keyConfigEntry(config.key["prevElement"])

 
        def keyRight(self):
 
        def keyRight(self):

-               self["entries"].handleKey(config.key["nextElement"])
+               self.timer.stop()
+               self.keyConfigEntry(config.key["nextElement"])

 
        def updateList(self, list):
                List = self["entries"]
 
        def updateList(self, list):
                List = self["entries"]


@@ -138,7 +154,7 @@ class CiMmi(Screen):
                        List.l.setList(list)
                        return
 
                        List.l.setList(list)
                        return
 

-               if self.tag == "ENQ":
+               if self.tag and self.tag == "ENQ":

                        type = TYPE_CONFIG
                else:
                        type = TYPE_MENU
                        type = TYPE_CONFIG
                else:
                        type = TYPE_MENU


@@ -153,7 +169,6 @@ class CiMmi(Screen):
 
                List.l.setList(list)
 
 
                List.l.setList(list)
 

-

        def showWait(self):
                self.tag = "WAIT"
                self["title"].setText("")
        def showWait(self):
                self.tag = "WAIT"
                self["title"].setText("")


@@ -168,23 +183,30 @@ class CiMmi(Screen):
        
                list = [ ]
 
        
                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:
                        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.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
                if self.action == 0:                    #reset
                        self.closeMmi()
                if self.action == 1:                    #init


@@ -197,70 +219,134 @@ class CiMmi(Screen):
                #mmi session still active ?                     
                if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1:
                        self.closeMmi()
                #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()
                        self.showScreen()

-                       
+

                #FIXME: check for mmi-session closed    
 
                #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):
        def __init__(self, session):

-               #FIXME support for one ci only

                Screen.__init__(self, session)
                Screen.__init__(self, session)

-               
-               self["actions"] = ActionMap(["OkCancelActions"], 
+
+               self["actions"] = ActionMap(["OkCancelActions"],

                        {
                                "ok": self.okbuttonClick,
                                "cancel": self.cancel
                        })
 
                        {
                                "ok": self.okbuttonClick,
                                "cancel": self.cancel
                        })
 

+               self.dlg = None
+               self.state = { }

                self.list = [ ]
                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()