fix fix

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

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 1604150d34ff413aabc92eba9183a93e3eacd827..85801861fe369c7e8e4205d36e35334294245ffe 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -5,7 +5,6 @@ from Components.ActionMap import ActionMap
 from EpgSelection import EPGSelection
 from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer
 from Components.config import config, configElement, ConfigSubsection, configText
 from EpgSelection import EPGSelection
 from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer
 from Components.config import config, configElement, ConfigSubsection, configText

-

 from Screens.FixedMenu import FixedMenu
 
 import xml.dom.minidom
 from Screens.FixedMenu import FixedMenu
 
 import xml.dom.minidom


@@ -29,8 +28,7 @@ class ChannelContextMenu(FixedMenu):
 
                menu = [ ]
 
 
                menu = [ ]
 

-               #HACK
-               inBouquetRootList = csel["list"].getRoot().toString().find('FROM BOUQUET "bouquets.') != -1
+               inBouquetRootList = csel.servicelist.getRoot().toString().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK

                inBouquet = csel.getMutableList() is not None
 
                if not csel.bouquet_mark_edit and not csel.movemode and not inBouquetRootList:
                inBouquet = csel.getMutableList() is not None
 
                if not csel.bouquet_mark_edit and not csel.movemode and not inBouquetRootList:


@@ -60,15 +58,14 @@ class ChannelContextMenu(FixedMenu):
                serviceHandler = eServiceCenter.getInstance()
                list = serviceHandler.list(self.csel.bouquet_root)
                if not list is None:
                serviceHandler = eServiceCenter.getInstance()
                list = serviceHandler.list(self.csel.bouquet_root)
                if not list is None:

-                       while 1:
+                       while True:

                                s = list.getNext()
                                if not s.valid():
                                        break
                                if ((s.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
                                        info = serviceHandler.info(s)
                                        if not info is None:
                                s = list.getNext()
                                if not s.valid():
                                        break
                                if ((s.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
                                        info = serviceHandler.info(s)
                                        if not info is None:

-                                               str = info.getName(s)
-                                               bouquets.append((str, s))
+                                               bouquets.append((info.getName(s), s))

                cnt = len(bouquets)
                if cnt > 1: # show bouquet list
                        self.session.open(BouquetSelector, bouquets, self)
                cnt = len(bouquets)
                if cnt > 1: # show bouquet list
                        self.session.open(BouquetSelector, bouquets, self)


@@ -100,14 +97,14 @@ class ChannelContextMenu(FixedMenu):
        def bouquetMarkAbort(self):
                self.csel.endMarkedEdit(abort=True)
                self.close()
        def bouquetMarkAbort(self):
                self.csel.endMarkedEdit(abort=True)
                self.close()

- 
+

 class ChannelSelection(Screen):
        def lastService(self):
                self.lastServiceTimer.stop()
                #zap to last running tv service
                self.setRoot(eServiceReference(config.tv.lastroot.value))
                self.session.nav.playService(eServiceReference(config.tv.lastservice.value))
 class ChannelSelection(Screen):
        def lastService(self):
                self.lastServiceTimer.stop()
                #zap to last running tv service
                self.setRoot(eServiceReference(config.tv.lastroot.value))
                self.session.nav.playService(eServiceReference(config.tv.lastservice.value))

-       
+

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


@@ -119,6 +116,7 @@ class ChannelSelection(Screen):
                self.entry_marked = False
                self.movemode = False
                self.bouquet_mark_edit = False
                self.entry_marked = False
                self.movemode = False
                self.bouquet_mark_edit = False

+               #self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')

                self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
                self.mutableList = None
 
                self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
                self.mutableList = None
 


@@ -128,11 +126,12 @@ class ChannelSelection(Screen):
                self["key_green"] = Button("Provider")
                self["key_yellow"] = Button("Satellite")
                self["key_blue"] = Button("Favourites")
                self["key_green"] = Button("Provider")
                self["key_yellow"] = Button("Satellite")
                self["key_blue"] = Button("Favourites")

-               
+

                self["list"] = ServiceList()
                self["list"] = ServiceList()

+               self.servicelist = self["list"]

 
                if config.tv.lastroot.value == "":
 
                if config.tv.lastroot.value == "":

-                       self["list"].setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
+                       self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))

                #self["okbutton"] = Button("ok", [self.channelSelected])
 
                self.lastServiceTimer = eTimer()
                #self["okbutton"] = Button("ok", [self.channelSelected])
 
                self.lastServiceTimer = eTimer()


@@ -143,7 +142,6 @@ class ChannelSelection(Screen):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
                                        l = self.csel
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
                                        l = self.csel

-                                       list = l["list"]

                                        if action.find("FROM BOUQUET") != -1:
                                                l.setRoot(eServiceReference("1:7:1:0:0:0:0:0:0:0:" + action[8:]))
                                        else:
                                        if action.find("FROM BOUQUET") != -1:
                                                l.setRoot(eServiceReference("1:7:1:0:0:0:0:0:0:0:" + action[8:]))
                                        else:


@@ -158,19 +156,19 @@ class ChannelSelection(Screen):
                                                        l.endMarkedEdit(True) # abort edit mode
                                        ActionMap.action(self, contexts, action)
 
                                                        l.endMarkedEdit(True) # abort edit mode
                                        ActionMap.action(self, contexts, action)
 

-               self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], 
+               self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],

                        {
                        {

-                               "cancel": self.close,
+                               "cancel": self.cancel,

                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,
                                "showFavourites": self.showFavourites,
                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,
                                "showFavourites": self.showFavourites,

-                   "showEPGList": self.showEPGList
+                               "showEPGList": self.showEPGList

                        })
                self["actions"].csel = self
 
        def showEPGList(self):
                        })
                self["actions"].csel = self
 
        def showEPGList(self):

-               ref=self["list"].getCurrent()
+               ref=self.servicelist.getCurrent()

                ptr=eEPGCache.getInstance()
                if ptr.startTimeQuery(ref) != -1:
                        self.session.open(EPGSelection, ref)
                ptr=eEPGCache.getInstance()
                if ptr.startTimeQuery(ref) != -1:
                        self.session.open(EPGSelection, ref)


@@ -182,29 +180,26 @@ class ChannelSelection(Screen):
                        return self.mutableList
                serviceHandler = eServiceCenter.getInstance()
                if not root.valid():
                        return self.mutableList
                serviceHandler = eServiceCenter.getInstance()
                if not root.valid():

-                       root=self["list"].getRoot()
+                       root=self.servicelist.getRoot()

                list = serviceHandler.list(root)
                list = serviceHandler.list(root)

-               mutableList = None

                if list is not None:
                if list is not None:

-                       mutableList = list.startEdit()
-               return mutableList
+                       return list.startEdit()
+               return None

 
 #  multiple marked entry stuff ( edit mode, later multiepg selection )
        def startMarkedEdit(self):
                self.mutableList = self.getMutableList()
 
 #  multiple marked entry stuff ( edit mode, later multiepg selection )
        def startMarkedEdit(self):
                self.mutableList = self.getMutableList()

-               l = self["list"]

                # add all services from the current list to internal marked set in listboxservicecontent
                # add all services from the current list to internal marked set in listboxservicecontent

-               self.bouquetRoot = l.getRoot()
+               self.bouquetRoot = self.servicelist.getRoot()

                self.clearMarks() # this clears the internal marked set in the listboxservicecontent
                self.bouquet_mark_edit = True
                self.clearMarks() # this clears the internal marked set in the listboxservicecontent
                self.bouquet_mark_edit = True

-               self.__marked = l.getRootServices()
+               self.__marked = self.servicelist.getRootServices()

                for x in self.__marked:
                for x in self.__marked:

-                       l.addMarked(eServiceReference(x))
+                       self.servicelist.addMarked(eServiceReference(x))

 
        def endMarkedEdit(self, abort):
 
        def endMarkedEdit(self, abort):

-               l = self["list"]

                if not abort and self.mutableList is not None:
                if not abort and self.mutableList is not None:

-                       new_marked = set(l.getMarked())
+                       new_marked = set(self.servicelist.getMarked())

                        old_marked = set(self.__marked)
                        removed = old_marked - new_marked
                        added = new_marked - old_marked
                        old_marked = set(self.__marked)
                        removed = old_marked - new_marked
                        added = new_marked - old_marked


@@ -226,52 +221,108 @@ class ChannelSelection(Screen):
                self.mutableList = None
 
        def clearMarks(self):
                self.mutableList = None
 
        def clearMarks(self):

-               self["list"].clearMarks()
+               self.servicelist.clearMarks()

 
        def doMark(self):
 
        def doMark(self):

-               ref = self["list"].getCurrent()
-               if self["list"].isMarked(ref):
-                       self["list"].removeMarked(ref)
+               ref = self.servicelist.getCurrent()
+               if self.servicelist.isMarked(ref):
+                       self.servicelist.removeMarked(ref)

                else:
                else:

-                       self["list"].addMarked(ref)
+                       self.servicelist.addMarked(ref)

 
        def removeCurrentService(self):
 
        def removeCurrentService(self):

-               l = self["list"]
-               ref = l.getCurrent()
+               ref = self.servicelist.getCurrent()

                mutableList = self.getMutableList()
                if ref.valid() and mutableList is not None:
                mutableList = self.getMutableList()
                if ref.valid() and mutableList is not None:

-                       if mutableList.removeService(ref) == 0:
+                       if not mutableList.removeService(ref):

                                mutableList.flushChanges() #FIXME dont flush on each single removed service
                                mutableList.flushChanges() #FIXME dont flush on each single removed service

-                               self.setRoot(l.getRoot())
+                               self.setRoot(self.servicelist.getRoot())

 
        def addCurrentServiceToBouquet(self, dest):
                mutableList = self.getMutableList(dest)
                if not mutableList is None:
 
        def addCurrentServiceToBouquet(self, dest):
                mutableList = self.getMutableList(dest)
                if not mutableList is None:

-                       if mutableList.addService(self["list"].getCurrent()) == 0:
+                       if not mutableList.addService(self.servicelist.getCurrent()):

                                mutableList.flushChanges()
                self.close()
 
                                mutableList.flushChanges()
                self.close()
 

+       def searchNumberHelper(self, serviceHandler, num, bouquet):
+               servicelist = serviceHandler.list(bouquet)
+               if not servicelist is None:
+                       while num:
+                               serviceIterator = servicelist.getNext()
+                               if not serviceIterator.valid(): #check end of list
+                                       break
+                               if serviceIterator.flags: #assume normal dvb service have no flags set
+                                       continue
+                               num -= 1;
+                       if not num: #found service with searched number ?
+                               return serviceIterator, 0
+               return None, num
+
+       def zapToNumber(self, number):
+               bouquet = self.bouquet_root
+               service = None
+               serviceHandler = eServiceCenter.getInstance()
+               if bouquet.toString().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
+                       service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
+               else:
+                       bouquetlist = serviceHandler.list(bouquet)
+                       if not bouquetlist is None:
+                               while number:
+                                       bouquet = bouquetlist.getNext()
+                                       if not bouquet.valid(): #check end of list
+                                               break
+                                       if ((bouquet.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory):
+                                               continue
+                                       service, number = self.searchNumberHelper(serviceHandler, number, bouquet)
+               if not service is None:
+                       self.session.nav.playService(service) #play service
+                       if self.servicelist.getRoot() != bouquet: #already in correct bouquet?
+                               self.setRoot(bouquet)
+                       self.servicelist.setCurrent(service) #select the service in servicelist
+
+       def getBouquetNumOffset(self, bouquet):
+               if self.bouquet_root.toString().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK
+                       return 0
+               offsetCount = 0
+               serviceHandler = eServiceCenter.getInstance()
+               bouquetlist = serviceHandler.list(self.bouquet_root)
+               if not bouquetlist is None:
+                       while True:
+                               bouquetIterator = bouquetlist.getNext()
+                               if not bouquetIterator.valid() or bouquetIterator == bouquet: #end of list or bouquet found
+                                       break
+                               if ((bouquetIterator.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory):
+                                       continue
+                               servicelist = serviceHandler.list(bouquetIterator)
+                               if not servicelist is None:
+                                       while True:
+                                               serviceIterator = servicelist.getNext()
+                                               if not serviceIterator.valid(): #check if end of list
+                                                       break
+                                               if serviceIterator.flags: #playable services have no flags
+                                                       continue
+                                               offsetCount += 1
+               return offsetCount
+

        def setRoot(self, root):
                if not self.movemode: # dont change root when movemode is enabled
        def setRoot(self, root):
                if not self.movemode: # dont change root when movemode is enabled

-                       list = self["list"]
-
-                       #HACK
-                       inBouquetRootList = root.toString().find('FROM BOUQUET "bouquets.') != -1
-
+                       inBouquetRootList = root.toString().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK

                        if not inBouquetRootList and ((root.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
                        if not inBouquetRootList and ((root.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):

-                               list.setMode(list.MODE_FAVOURITES)
+                               self.servicelist.setMode(ServiceList.MODE_FAVOURITES)
+                               self.servicelist.setNumberOffset(self.getBouquetNumOffset(root))

                        else:
                        else:

-                               list.setMode(list.MODE_NORMAL)
-                       list.setRoot(root)
+                               self.servicelist.setMode(ServiceList.MODE_NORMAL)
+                       self.servicelist.setRoot(root)

 
        def channelSelected(self):
 
        def channelSelected(self):

-               ref = self["list"].getCurrent()
+               ref = self.servicelist.getCurrent()

                if self.movemode:
                        if self.entry_marked:
                if self.movemode:
                        if self.entry_marked:

-                               self["list"].setCurrentMarked(False)
+                               self.servicelist.setCurrentMarked(False)

                                self.entry_marked = False
                        else:
                                self.entry_marked = False
                        else:

-                               self["list"].setCurrentMarked(True)
+                               self.servicelist.setCurrentMarked(True)

                                self.entry_marked = True
                elif (ref.flags & 7) == 7:
                        self.setRoot(ref)
                                self.entry_marked = True
                elif (ref.flags & 7) == 7:
                        self.setRoot(ref)


@@ -284,14 +335,14 @@ class ChannelSelection(Screen):
 
        #called from infoBar
        def zap(self):
 
        #called from infoBar
        def zap(self):

-               self.session.nav.playService(self["list"].getCurrent())
+               self.session.nav.playService(self.servicelist.getCurrent())

                self.saveChannel()
 
        def moveUp(self):
                self.saveChannel()
 
        def moveUp(self):

-               self["list"].moveUp()
+               self.servicelist.moveUp()

 
        def moveDown(self):
 
        def moveDown(self):

-               self["list"].moveDown()
+               self.servicelist.moveDown()

 
        def doContext(self):
                self.session.open(ChannelContextMenu, self)
 
        def doContext(self):
                self.session.open(ChannelContextMenu, self)


@@ -323,3 +374,27 @@ class ChannelSelection(Screen):
                        refstr = ""
                config.tv.lastservice.value = refstr
                config.tv.lastservice.save()
                        refstr = ""
                config.tv.lastservice.value = refstr
                config.tv.lastservice.save()

+               
+       def cancel(self):
+               self.close()
+
+class SimpleChannelSelection(ChannelSelection):
+       def __init__(self, session, title):
+               ChannelSelection.__init__(self, session)
+               self.title = title
+               self.onShown.append(self.onExecCallback)
+
+       def onExecCallback(self):
+               print "onExecCallback"
+               self.session.currentDialog.instance.setTitle(self.title)
+               
+       def channelSelected(self): # just return selected service
+               ref = self.servicelist.getCurrent()
+               self.close(ref)
+               
+       def doContext(self): # don't show context menu
+               pass
+       
+       def cancel(self):
+               self.close(None)
+               
\ No newline at end of file