add config options for linked NIMs

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

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 1fe572e90f30ac57fbd92f358506c2114434d3f9..3ae46f7436fa3d8ffa1e732209262055e262b898 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -2,41 +2,94 @@ from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap
 from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap

-
-from enigma import eServiceReference
-
+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
 

+class BouquetSelector(FixedMenu):
+       def __init__(self, session, bouquets, parent):
+               self.parent=parent
+               entrys = [ ]
+               for x in bouquets:
+                       entrys.append((x[0], self.bouquetSelected, x[1]))
+               FixedMenu.__init__(self, session, "Bouquetlist", entrys)
+               self.skinName = "Menu"
+
+       def bouquetSelected(self):
+               self.parent.addCurrentServiceToBouquet(self["menu"].getCurrent()[2])
+               self.close()
+

 class ChannelContextMenu(FixedMenu):
        def __init__(self, session, csel):
                self.csel = csel
 class ChannelContextMenu(FixedMenu):
        def __init__(self, session, csel):
                self.csel = csel

-               
-               menu = [("back", self.close)]
-               
-               if csel.movemode:
-                       menu.append(("disable move mode", self.moveMode))
-               else:
-                       menu.append(("enable move mode", self.moveMode))

 
 

-               if csel.bouquet_mark_edit:
-                       menu.append(("end bouquet edit", self.bouquetMarkEnd))
-                       menu.append(("abort bouquet edit", self.bouquetMarkAbort))
-               else:
-                       menu.append(("edit bouquet...", self.bouquetMarkStart))
-               
+               menu = [ ]
+
+               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:
+                       menu.append(("add service to bouquet", self.addServiceToBouquetSelected))
+                       if inBouquet:
+                               menu.append(("remove service", self.removeCurrentService))
+
+               if inBouquet: # current list is editable?
+                       if not csel.bouquet_mark_edit:
+                               if not csel.movemode:
+                                       menu.append(("enable move mode", self.toggleMoveMode))
+                                       if not inBouquetRootList: 
+                                               menu.append(("enable bouquet edit", self.bouquetMarkStart))
+                               else:
+                                       menu.append(("disable move mode", self.toggleMoveMode))
+                       elif not inBouquetRootList: 
+                               menu.append(("end bouquet edit", self.bouquetMarkEnd))
+                               menu.append(("abort bouquet edit", self.bouquetMarkAbort))
+
+               menu.append(("back", self.close))
+

                FixedMenu.__init__(self, session, "Channel Selection", menu)
                self.skinName = "Menu"
 
                FixedMenu.__init__(self, session, "Channel Selection", menu)
                self.skinName = "Menu"
 

-       def moveMode(self):
-               self.csel.setMoveMode(self.csel.movemode)
+       def addServiceToBouquetSelected(self):
+               bouquets = [ ]
+               serviceHandler = eServiceCenter.getInstance()
+               list = serviceHandler.list(self.csel.bouquet_root)
+               if not list is None:
+                       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:
+                                               bouquets.append((info.getName(s), s))
+               cnt = len(bouquets)
+               if cnt > 1: # show bouquet list
+                       self.session.open(BouquetSelector, bouquets, self)
+               elif cnt == 1: # add to only one existing bouquet
+                       self.addCurrentServiceToBouquet(bouquet[0][1])
+               else: #no bouquets in root.. so assume only one favourite list is used
+                       self.addCurrentServiceToBouquet(self.csel.bouquet_root)
+
+       def addCurrentServiceToBouquet(self, dest):
+               self.csel.addCurrentServiceToBouquet(dest)
+               self.close()
+
+       def removeCurrentService(self):
+               self.csel.removeCurrentService()

                self.close()
                self.close()

-       
+
+       def toggleMoveMode(self):
+               self.csel.toggleMoveMode()
+               self.close()
+

        def bouquetMarkStart(self):
                self.csel.startMarkedEdit()
                self.close()
        def bouquetMarkStart(self):
                self.csel.startMarkedEdit()
                self.close()

-       
+

        def bouquetMarkEnd(self):
                self.csel.endMarkedEdit(abort=False)
                self.close()
        def bouquetMarkEnd(self):
                self.csel.endMarkedEdit(abort=False)
                self.close()


@@ -44,118 +97,280 @@ 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):
 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)

-               
+
+               #config for lastservice
+               config.tv = ConfigSubsection();
+               config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
+               config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
+

                self.entry_marked = False
                self.movemode = False
                self.bouquet_mark_edit = False
                self.entry_marked = False
                self.movemode = False
                self.bouquet_mark_edit = False

-               
-               ## FIXME
+               #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.__marked = [ ]
                self.__marked = [ ]

-               
+

                self["key_red"] = Button("All")
                self["key_green"] = Button("Provider")
                self["key_yellow"] = Button("Satellite")
                self["key_blue"] = Button("Favourites")
                self["key_red"] = Button("All")
                self["key_green"] = Button("Provider")
                self["key_yellow"] = Button("Satellite")
                self["key_blue"] = Button("Favourites")

-               
+

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

-               self["list"].setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
-               
+               self.servicelist = self["list"]
+
+               if config.tv.lastroot.value == "":
+                       self.servicelist.setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))

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

-               
+
+               self.lastServiceTimer = eTimer()
+               self.lastServiceTimer.timeout.get().append(self.lastService)
+               self.lastServiceTimer.start(100)
+

                class ChannelActionMap(ActionMap):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":
                class ChannelActionMap(ActionMap):
                        def action(self, contexts, action):
                                if action[:7] == "bouquet":

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

                                else:
                                else:

+                                       if action == "cancel":
+                                               l = self.csel
+                                               if l.movemode: #movemode active?
+                                                       l.channelSelected() # unmark
+                                                       l.toggleMoveMode() # disable move mode
+                                               elif l.bouquet_mark_edit:
+                                                       l.endMarkedEdit(True) # abort edit mode

                                        ActionMap.action(self, contexts, action)
 
                                        ActionMap.action(self, contexts, action)
 

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

                        {
                                "cancel": self.close,
                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,
                        {
                                "cancel": self.close,
                                "ok": self.channelSelected,
                                "mark": self.doMark,
                                "contextMenu": self.doContext,

-                               "showFavourites": self.showFavourites
+                               "showFavourites": self.showFavourites,
+                               "showEPGList": self.showEPGList

                        })
                self["actions"].csel = self
 
                        })
                self["actions"].csel = self
 

-       #  marked edit mode
-       
+       def showEPGList(self):
+               ref=self.servicelist.getCurrent()
+               ptr=eEPGCache.getInstance()
+               if ptr.startTimeQuery(ref) != -1:
+                       self.session.open(EPGSelection, ref)
+               else:
+                       print 'no epg for service', ref.toString()
+
+       def getMutableList(self, root=eServiceReference()):
+               if not self.mutableList is None:
+                       return self.mutableList
+               serviceHandler = eServiceCenter.getInstance()
+               if not root.valid():
+                       root=self.servicelist.getRoot()
+               list = serviceHandler.list(root)
+               if list is not None:
+                       return list.startEdit()
+               return None
+
+#  multiple marked entry stuff ( edit mode, later multiepg selection )

        def startMarkedEdit(self):
        def startMarkedEdit(self):

+               self.mutableList = self.getMutableList()
+               # add all services from the current list to internal marked set in listboxservicecontent
+               self.bouquetRoot = self.servicelist.getRoot()
+               self.clearMarks() # this clears the internal marked set in the listboxservicecontent

                self.bouquet_mark_edit = True
                self.bouquet_mark_edit = True

-               self.clearMarks()
-               
-               # TODO
-               marked = self.__marked
-               
-               l = self["list"]
-               for x in marked:
-                       l.addMarked(x)
-               
+               self.__marked = self.servicelist.getRootServices()
+               for x in self.__marked:
+                       self.servicelist.addMarked(eServiceReference(x))
+

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

-               self.bouquet_mark_edit = True
-               new_marked = self["list"].getMarked()
-               self.__marked = new_marked
+               if not abort and self.mutableList is not None:
+                       new_marked = set(self.servicelist.getMarked())
+                       old_marked = set(self.__marked)
+                       removed = old_marked - new_marked
+                       added = new_marked - old_marked
+                       changed = False
+                       for x in removed:
+                               changed = True
+                               self.mutableList.removeService(eServiceReference(x))
+                       for x in added:
+                               changed = True
+                               self.mutableList.addService(eServiceReference(x))
+                       if changed:
+                               self.mutableList.flushChanges()
+                               self.setRoot(self.bouquetRoot)
+                               #self.showFavourites()
+               self.__marked = []

                self.clearMarks()
                self.bouquet_mark_edit = False
                self.clearMarks()
                self.bouquet_mark_edit = False

+               self.bouquetRoot = None
+               self.mutableList = None

 
        def clearMarks(self):
 
        def clearMarks(self):

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

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

-               if not self.bouquet_mark_edit:
-                       return
-               
-               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):
+               ref = self.servicelist.getCurrent()
+               mutableList = self.getMutableList()
+               if ref.valid() and mutableList is not None:
+                       if not mutableList.removeService(ref):
+                               mutableList.flushChanges() #FIXME dont flush on each single removed service
+                               self.setRoot(self.servicelist.getRoot())
+
+       def addCurrentServiceToBouquet(self, dest):
+               mutableList = self.getMutableList(dest)
+               if not mutableList is None:
+                       if not mutableList.addService(self.servicelist.getCurrent()):
+                               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
+                       inBouquetRootList = root.toString().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
+                       if not inBouquetRootList and ((root.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
+                               self.servicelist.setMode(ServiceList.MODE_FAVOURITES)
+                               self.servicelist.setNumberOffset(self.getBouquetNumOffset(root))
+                       else:
+                               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.entry_marked = True
                elif (ref.flags & 7) == 7:

-                       l = self["list"]
-                       l.setMode(l.MODE_NORMAL)
-                       l.setRoot(ref)
+                       self.setRoot(ref)
+               elif self.bouquet_mark_edit:
+                       self.doMark()

                else:
                        self.session.nav.playService(ref)
                else:
                        self.session.nav.playService(ref)

+                       self.saveChannel()

                        self.close()
 
        #called from infoBar
        def zap(self):
                        self.close()
 
        #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):
 
        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)
 

-       def setMoveMode(self, mode):
-               if mode:
+       def toggleMoveMode(self):
+               if self.movemode:
+                       if self.entry_marked:
+                               self.channelSelected() # unmark current entry

                        self.movemode = False
                        self.movemode = False

+                       self.mutableList.flushChanges() # FIXME add check if changes was made
+                       self.mutableList = None

                else:
                else:

+                       self.mutableList = self.getMutableList()

                        self.movemode = True
                        self.movemode = True

-       
+

        def showFavourites(self):
        def showFavourites(self):

-               l = self["list" ]
-               l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))
-               l.setMode(l.MODE_FAVOURITES)
+               self.setRoot(self.bouquet_root)
+
+       def saveRoot(self, root):
+               if root is not None:
+                       config.tv.lastroot.value = root.toString()
+                       config.tv.lastroot.save()
+
+       def saveChannel(self):
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               if ref is not None:
+                       refstr = ref.toString()
+               else:
+                       refstr = ""
+               config.tv.lastservice.value = refstr
+               config.tv.lastservice.save()