git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
do not delete timer.. (sefault in some situations)
[enigma2.git] / lib / python / Screens / ChannelSelection.py
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 61c670389fcba38c9637b0e9e82a08a647564dd4..f273daa7a8c2afd20a9e8bc986a0b7d2176a1216 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -1,42 +1,97 @@
 from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
-from Components.ActionMap import ActionMap
+from Components.ActionMap import NumberActionMap
 from EpgSelection import EPGSelection
 from EpgSelection import EPGSelection
-from enigma import eServiceReference, eEPGCache, eEPGCachePtr
-
+from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer
+from Components.config import config, configElement, ConfigSubsection, configText
 from Screens.FixedMenu import FixedMenu
 from Screens.FixedMenu import FixedMenu
+from Tools.NumericalTextInput import NumericalTextInput
 
 import xml.dom.minidom
 
 
 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().getPath().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:
+                       if (csel.getCurrentSelection().type & eServiceReference.flagDirectory) != eServiceReference.flagDirectory:
+                               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,126 +99,378 @@ 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 __init__(self, session):
-               Screen.__init__(self, session)
-               
+
+class ChannelSelectionEdit:
+       def __init__(self):
                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.mutableList = None
                self.__marked = [ ]
                self.__marked = [ ]
-               
+
+       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):
+               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.__marked = self.servicelist.getRootServices()
+               for x in self.__marked:
+                       self.servicelist.addMarked(eServiceReference(x))
+
+       def endMarkedEdit(self, abort):
+               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.bouquetRoot = None
+               self.mutableList = None
+
+       def clearMarks(self):
+               self.servicelist.clearMarks()
+
+       def doMark(self):
+               ref = self.servicelist.getCurrent()
+               if self.servicelist.isMarked(ref):
+                       self.servicelist.removeMarked(ref)
+               else:
+                       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 toggleMoveMode(self):
+               if self.movemode:
+                       if self.entry_marked:
+                               self.toggleMoveMarked() # unmark current entry
+                       self.movemode = False
+                       self.mutableList.flushChanges() # FIXME add check if changes was made
+                       self.mutableList = None
+               else:
+                       self.mutableList = self.getMutableList()
+                       self.movemode = True
+
+       def handleEditCancel(self):
+               if self.movemode: #movemode active?
+                       self.channelSelected() # unmark
+                       self.toggleMoveMode() # disable move mode
+               elif self.bouquet_mark_edit:
+                       self.endMarkedEdit(True) # abort edit mode
+
+       def toggleMoveMarked(self):
+               if self.entry_marked:
+                       self.servicelist.setCurrentMarked(False)
+                       self.entry_marked = False
+               else:
+                       self.servicelist.setCurrentMarked(True)
+                       self.entry_marked = True
+
+       def doContext(self):
+               self.session.open(ChannelContextMenu, self)
+
+class ChannelSelectionBase(Screen):
+       def __init__(self, session):
+               Screen.__init__(self, session)
+
+               # this makes it much simple to implement a selectable radio or tv mode :)
+               self.service_types_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17)'
+               self.service_types_radio = '1:7:1:0:0:0:0:0:0:0:(type == 2)'
+
+               self.service_types = self.service_types_tv
+
+               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('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+
                self["key_red"] = Button("All")
                self["key_red"] = Button("All")
-               self["key_green"] = Button("Provider")
-               self["key_yellow"] = Button("Satellite")
+               self["key_green"] = Button("Satellites")
+               self["key_yellow"] = Button("Provider")
                self["key_blue"] = Button("Favourites")
                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"]
+
                #self["okbutton"] = Button("ok", [self.channelSelected])
                #self["okbutton"] = Button("ok", [self.channelSelected])
-               
-               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:7:1:0:0:0:0:0:0:0:" + action[8:]))
-                               else:
-                                       ActionMap.action(self, contexts, action)
 
 
-               self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], 
+               self.numericalTextInput = NumericalTextInput()
+
+       def getBouquetNumOffset(self, bouquet):
+               if self.bouquet_root.getPath().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 setRootBase(self, root):
+               inBouquetRootList = root.getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
+               if not inBouquetRootList and (root.getPath().find('FROM BOUQUET') != -1):
+                       self.servicelist.setMode(ServiceList.MODE_FAVOURITES)
+                       self.servicelist.setNumberOffset(self.getBouquetNumOffset(root))
+               else:
+                       self.servicelist.setMode(ServiceList.MODE_NORMAL)
+               self.servicelist.setRoot(root)
+
+       def moveUp(self):
+               self.servicelist.moveUp()
+
+       def moveDown(self):
+               self.servicelist.moveDown()
+
+       def showAllServices(self):
+               ref = eServiceReference('%s ORDER BY name'%(self.service_types))
+               self.setRoot(ref)
+
+       def showSatellites(self):
+               ref = eServiceReference('%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types))
+               self.setRoot(ref)
+
+       def showProviders(self):
+               ref = eServiceReference('%s FROM PROVIDERS ORDER BY name'%(self.service_types))
+               self.setRoot(ref)
+
+       def showFavourites(self):
+               self.setRoot(self.bouquet_root)
+
+       def keyNumberGlobal(self, number):
+               char = self.numericalTextInput.getKey(number)
+               print "You pressed number " + str(number)
+               print "You would go to character " + str(char)
+               self.servicelist.moveToChar(char)
+
+       def enterBouquet(self, action):
+               if action[:7] == "bouquet":
+                       if action.find("FROM BOUQUET") != -1:
+                               self.setRoot(eServiceReference("1:7:1:0:0:0:0:0:0:0:" + action[8:]))
+                       else:
+                               self.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
+                       return True
+               return False
+
+       def getRoot(self):
+               return self.servicelist.getRoot()
+
+       def getCurrentSelection(self):
+               return self.servicelist.getCurrent()
+
+       def setCurrentSelection(self, service):
+               self.servicelist.setCurrent(service)
+
+       def cancel(self):
+               self.close(None)
+
+class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
+       def __init__(self, session):
+               ChannelSelectionBase.__init__(self,session)
+               ChannelSelectionEdit.__init__(self)
+
+               #config for lastservice
+               config.tv = ConfigSubsection();
+               config.tv.lastservice = configElement("config.tv.lastservice", configText, "", 0);
+               config.tv.lastroot = configElement("config.tv.lastroot", configText, "", 0);
+
+               class ChannelActionMap(NumberActionMap):
+                       def action(self, contexts, action):
+                               if not self.csel.enterBouquet(action):
+                                       if action == "cancel":
+                                               self.csel.handleEditCancel()
+                                       NumberActionMap.action(self, contexts, action)
+               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
+                               "showAllServices": self.showAllServices,
+                               "showProviders": self.showProviders,
+                               "showSatellites": self.showSatellites,
+                               "showEPGList": self.showEPGList,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal,
+                               "0": self.keyNumberGlobal
                        })
                self["actions"].csel = self
                        })
                self["actions"].csel = self
+               self.onShown.append(self.onShow)
+
+#              self.onLayoutFinish.append(self.onCreate)
+               self.lastChannelRootTimer = eTimer()
+               self.lastChannelRootTimer.timeout.get().append(self.onCreate)
+               self.lastChannelRootTimer.start(100,True)
+
+       def onCreate(self):
+               lastroot=eServiceReference(config.tv.lastroot.value)
+               if lastroot.valid():
+                       self.setRoot(lastroot)
+               else:
+                       self.showFavourites()
+                       self.saveRoot(self.getRoot())
+               lastservice=eServiceReference(config.tv.lastservice.value)
+               if lastservice.valid():
+                       self.session.nav.playService(lastservice)
+                       self.servicelist.setCurrent(lastservice)
+
+       def onShow(self):
+               ref = self.session.nav.getCurrentlyPlayingServiceReference()
+               if ref is not None and ref.valid() and ref.getPath() == "":
+                       self.servicelist.setPlayableIgnoreService(ref)
+               else:
+                       self.servicelist.setPlayableIgnoreService(eServiceReference())
 
        def showEPGList(self):
 
        def showEPGList(self):
-               ref=self["list"].getCurrent()
+               ref=self.getCurrentSelection()
                ptr=eEPGCache.getInstance()
                if ptr.startTimeQuery(ref) != -1:
                        self.session.open(EPGSelection, ref)
                else:
                        print 'no epg for service', ref.toString()
 
                ptr=eEPGCache.getInstance()
                if ptr.startTimeQuery(ref) != -1:
                        self.session.open(EPGSelection, ref)
                else:
                        print 'no epg for service', ref.toString()
 
-       #  marked edit mode
-       def startMarkedEdit(self):
-               self.bouquet_mark_edit = True
-               self.clearMarks()
-               
-               # TODO
-               marked = self.__marked
-               
-               l = self["list"]
-               for x in marked:
-                       l.addMarked(x)
-               
-       def endMarkedEdit(self, abort):
-               self.bouquet_mark_edit = True
-               new_marked = self["list"].getMarked()
-               self.__marked = new_marked
-               self.clearMarks()
-               self.bouquet_mark_edit = False
-
-       def clearMarks(self):
-               self["list"].clearMarks()
-       
-       def doMark(self):
-               if not self.bouquet_mark_edit:
-                       return
-               
-               ref = self["list"].getCurrent()
-               if self["list"].isMarked(ref):
-                       self["list"].removeMarked(ref)
-               else:
-                       self["list"].addMarked(ref)
-       
-       # ...
        def channelSelected(self):
        def channelSelected(self):
-               ref = self["list"].getCurrent()
+               ref = self.getCurrentSelection()
                if self.movemode:
                if self.movemode:
-                       if self.entry_marked:
-                               self["list"].setCurrentMarked(False)
-                               self.entry_marked = False
-                       else:
-                               self["list"].setCurrentMarked(True)
-                               self.entry_marked = True
+                       self.toggleMoveMarked()
                elif (ref.flags & 7) == 7:
                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:
                else:
-                       self.session.nav.playService(ref)
-                       self.close()
+                       self.zap()
+                       self.close(ref)
+
+       def setRoot(self, root):
+               if not self.movemode:
+                       self.setRootBase(root)
 
 
-       #called from infoBar
+       #called from infoBar and channelSelected
        def zap(self):
        def zap(self):
-               self.session.nav.playService(self["list"].getCurrent())
+               self.session.nav.playService(self.getCurrentSelection())
+               self.saveRoot(self.getRoot())
+               self.saveChannel()
 
 
-       def moveUp(self):
-               self["list"].moveUp()
+       def saveRoot(self, root):
+               if root is not None:
+                       config.tv.lastroot.value = root.toString()
+                       config.tv.lastroot.save()
 
 
-       def moveDown(self):
-               self["list"].moveDown()
+       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()
 
 
-       def doContext(self):
-               self.session.open(ChannelContextMenu, self)
+       def cancel(self):
+               self.close(None)
+               lastroot=eServiceReference(config.tv.lastroot.value)
+               lastservice=eServiceReference(config.tv.lastservice.value)
+               if lastroot.valid() and self.getRoot() != lastroot:
+                       self.setRoot(lastroot)
+               if lastservice.valid() and self.getCurrentSelection() != lastservice:
+                       self.servicelist.setCurrent(lastservice)
 
 
-       def setMoveMode(self, mode):
-               if mode:
-                       self.movemode = False
-               else:
-                       self.movemode = True
+class SimpleChannelSelection(ChannelSelectionBase):
+       def __init__(self, session, title):
+               ChannelSelectionBase.__init__(self, session)
+               self.title = title
+               self.onShown.append(self.onExecCallback)
+
+               class ChannelActionMap(NumberActionMap):
+                       def action(self, contexts, action):
+                               if not self.csel.enterBouquet(action):
+                                       NumberActionMap.action(self, contexts, action)
+               self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
+                       {
+                               "cancel": self.cancel,
+                               "ok": self.channelSelected,
+                               "showFavourites": self.showFavourites,
+                               "showAllServices": self.showAllServices,
+                               "showProviders": self.showProviders,
+                               "showSatellites": self.showSatellites,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal,
+                               "0": self.keyNumberGlobal
+                       })
+               self["actions"].csel = self
+
+       def onExecCallback(self):
+               print "onExecCallback"
+               self.showFavourites()
+               self.session.currentDialog.instance.setTitle(self.title)
+
+       def channelSelected(self): # just return selected service
+               ref = self.getCurrentSelection()
+               self.close(ref)
+
+       def setRoot(self, root):
+               self.setRootBase(root)
 
 
-       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)
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources