X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/89b8546abecd391992fbe7ba06cbeea6310b07a1..e229957abd9adea4c73635e6291edf9af9c18d40:/lib/python/Screens/ChannelSelection.py diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index aaf3d4b7..b850b2cb 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -7,12 +7,14 @@ from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, e from Components.config import config, configElement, ConfigSubsection, configText from Screens.FixedMenu import FixedMenu from Tools.NumericalTextInput import NumericalTextInput +from Components.NimManager import nimmanager +from Components.EventInfo import EventInfo import xml.dom.minidom class BouquetSelector(FixedMenu): - def __init__(self, session, bouquets, parent): - self.parent=parent + def __init__(self, session, bouquets, selectedFunc): + self.selectedFunc=selectedFunc entrys = [ ] for x in bouquets: entrys.append((x[0], self.bouquetSelected, x[1])) @@ -20,8 +22,7 @@ class BouquetSelector(FixedMenu): self.skinName = "Menu" def bouquetSelected(self): - self.parent.addCurrentServiceToBouquet(self["menu"].getCurrent()[2]) - self.close() + self.selectedFunc(self["menu"].getCurrent()[2]) class ChannelContextMenu(FixedMenu): def __init__(self, session, csel): @@ -31,48 +32,51 @@ class ChannelContextMenu(FixedMenu): inBouquetRootList = csel.servicelist.getRoot().getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK inBouquet = csel.getMutableList() is not None + haveBouquets = csel.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') != -1 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 (csel.getCurrentSelection().flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory: + if haveBouquets: + menu.append((_("add service to bouquet"), self.addServiceToBouquetSelected)) + else: + menu.append((_("add service to favourites"), self.addServiceToBouquetSelected)) if inBouquet: - menu.append(("remove service", self.removeCurrentService)) + 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)) + menu.append((_("enable move mode"), self.toggleMoveMode)) if not inBouquetRootList: - menu.append(("enable bouquet edit", self.bouquetMarkStart)) + if haveBouquets: + menu.append((_("enable bouquet edit"), self.bouquetMarkStart)) + else: + menu.append((_("enable favourite edit"), self.bouquetMarkStart)) else: - menu.append(("disable move mode", self.toggleMoveMode)) + menu.append((_("disable move mode"), self.toggleMoveMode)) elif not inBouquetRootList: - menu.append(("end bouquet edit", self.bouquetMarkEnd)) - menu.append(("abort bouquet edit", self.bouquetMarkAbort)) + if haveBouquets: + menu.append((_("end bouquet edit"), self.bouquetMarkEnd)) + menu.append((_("abort bouquet edit"), self.bouquetMarkAbort)) + else: + menu.append((_("end favourites edit"), self.bouquetMarkEnd)) + menu.append((_("abort favourites edit"), self.bouquetMarkAbort)) - menu.append(("back", self.close)) + menu.append((_("back"), self.close)) - FixedMenu.__init__(self, session, "Channel Selection", menu) + FixedMenu.__init__(self, session, _("Channel Selection"), menu) self.skinName = "Menu" 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) + bouquets = self.csel.getBouquetList() + if bouquets is None: + cnt = 0 + else: + cnt = len(bouquets) if cnt > 1: # show bouquet list - self.session.open(BouquetSelector, bouquets, self) + self.session.open(BouquetSelector, bouquets, self.addCurrentServiceToBouquet) elif cnt == 1: # add to only one existing bouquet - self.addCurrentServiceToBouquet(bouquet[0][1]) + self.addCurrentServiceToBouquet(bouquets[0][1]) else: #no bouquets in root.. so assume only one favourite list is used self.addCurrentServiceToBouquet(self.csel.bouquet_root) @@ -107,6 +111,8 @@ class ChannelSelectionEdit: self.bouquet_mark_edit = False self.mutableList = None self.__marked = [ ] + self.saved_title = None + self.saved_root = None def getMutableList(self, root=eServiceReference()): if not self.mutableList is None: @@ -125,10 +131,19 @@ class ChannelSelectionEdit: # 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.saved_title = self.instance.getTitle() + new_title = self.saved_title + if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') != -1: + new_title += ' ' + _("[bouquet edit]") + else: + new_title += ' ' + _("[favourite edit]") + self.instance.setTitle(new_title) self.bouquet_mark_edit = True self.__marked = self.servicelist.getRootServices() for x in self.__marked: self.servicelist.addMarked(eServiceReference(x)) + self.saved_root = self.getRoot() + self.showAllServices() def endMarkedEdit(self, abort): if not abort and self.mutableList is not None: @@ -145,13 +160,14 @@ class ChannelSelectionEdit: 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 + self.instance.setTitle(self.saved_title) + self.saved_title = None + self.setRoot(self.saved_root) def clearMarks(self): self.servicelist.clearMarks() @@ -168,8 +184,13 @@ class ChannelSelectionEdit: mutableList = self.getMutableList() if ref.valid() and mutableList is not None: if not mutableList.removeService(ref): + currentIndex = self.servicelist.getCurrentIndex() + self.servicelist.moveDown() + if self.servicelist.getCurrentIndex() == currentIndex: + currentIndex -= 1 mutableList.flushChanges() #FIXME dont flush on each single removed service self.setRoot(self.servicelist.getRoot()) + self.servicelist.moveToIndex(currentIndex) def addCurrentServiceToBouquet(self, dest): mutableList = self.getMutableList(dest) @@ -185,9 +206,15 @@ class ChannelSelectionEdit: self.movemode = False self.mutableList.flushChanges() # FIXME add check if changes was made self.mutableList = None + self.instance.setTitle(self.saved_title) + self.saved_title = None else: self.mutableList = self.getMutableList() self.movemode = True + self.saved_title = self.instance.getTitle() + new_title = self.saved_title + new_title += ' ' + _("[move mode]"); + self.instance.setTitle(new_title); def handleEditCancel(self): if self.movemode: #movemode active? @@ -207,6 +234,11 @@ class ChannelSelectionEdit: def doContext(self): self.session.open(ChannelContextMenu, self) +USE_MULTIBOUQUETS = False + +MODE_TV = 0 +MODE_RADIO = 1 + class ChannelSelectionBase(Screen): def __init__(self, session): Screen.__init__(self, session) @@ -215,24 +247,25 @@ class ChannelSelectionBase(Screen): 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_green"] = Button("Satellites") - self["key_yellow"] = Button("Provider") - self["key_blue"] = Button("Favourites") + self["key_red"] = Button(_("All")) + self["key_green"] = Button(_("Satellites")) + self["key_yellow"] = Button(_("Provider")) + self["key_blue"] = Button(_("Favourites")) self["list"] = ServiceList() self.servicelist = self["list"] - #self["okbutton"] = Button("ok", [self.channelSelected]) - self.numericalTextInput = NumericalTextInput() + def appendDVBTypes(self, ref): + path = ref.getPath() + pos = path.find(' FROM BOUQUET') + if pos != -1: + return eServiceReference(self.service_types + path[pos:]) + return ref + def getBouquetNumOffset(self, bouquet): + bouquet = self.appendDVBTypes(bouquet) if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK return 0 offsetCount = 0 @@ -240,7 +273,7 @@ class ChannelSelectionBase(Screen): bouquetlist = serviceHandler.list(self.bouquet_root) if not bouquetlist is None: while True: - bouquetIterator = bouquetlist.getNext() + bouquetIterator = self.appendDVBTypes(bouquetlist.getNext()) if not bouquetIterator.valid() or bouquetIterator == bouquet: #end of list or bouquet found break if ((bouquetIterator.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory): @@ -256,14 +289,47 @@ class ChannelSelectionBase(Screen): 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): + def setTvMode(self): + self.service_types = self.service_types_tv + if USE_MULTIBOUQUETS: + self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet') + else: + self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types)) + title = self.instance.getTitle() + pos = title.find(" (") + if pos != -1: + title = title[:pos] + title += " (TV)" + self.instance.setTitle(title) + self.mode = MODE_TV + + def setRadioMode(self): + self.service_types = self.service_types_radio + if USE_MULTIBOUQUETS: + self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.radio" ORDER BY bouquet') + else: + self.bouquet_root = eServiceReference('%s FROM BOUQUET "userbouquet.favourites.radio" ORDER BY bouquet'%(self.service_types)) + title = self.instance.getTitle() + pos = title.find(" (") + if pos != -1: + title = title[:pos] + title += " (Radio)" + self.instance.setTitle(title) + self.mode = MODE_RADIO + + def setRootBase(self, root, justSet=False): + path = root.getPath() + inBouquetRootList = path.find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK + pos = path.find(' FROM BOUQUET') + isBouquet = pos != -1 + if not inBouquetRootList and isBouquet: self.servicelist.setMode(ServiceList.MODE_FAVOURITES) self.servicelist.setNumberOffset(self.getBouquetNumOffset(root)) + refstr = self.service_types + path[pos:] + root = eServiceReference(refstr) else: self.servicelist.setMode(ServiceList.MODE_NORMAL) - self.servicelist.setRoot(root) + self.servicelist.setRoot(root, justSet) def moveUp(self): self.servicelist.moveUp() @@ -277,7 +343,29 @@ class ChannelSelectionBase(Screen): def showSatellites(self): ref = eServiceReference('%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types)) - self.setRoot(ref) + self.setRoot(ref, True) + serviceHandler = eServiceCenter.getInstance() + servicelist = serviceHandler.list(ref) + if not servicelist is None: + while True: + service = servicelist.getNext() + if not service.valid(): #check if end of list + break + orbpos = service.getData(4) >> 16 + if service.getPath().find("FROM PROVIDER") != -1: + service_name = _("Providers") + else: + service_name = _("Services") + try: + service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos))) + service.setName(service_name) # why we need this cast? + except: + if orbpos > 1800: # west + service.setName("%s (%3.1f" + _("W") + ")" %(str, (0 - (orbpos - 3600)) / 10.0)) + else: + service.setName("%s (%3.1f" + _("E") + ")" % (str, orbpos / 10.0)) + self.servicelist.addService(service) + self.servicelist.finishFill() def showProviders(self): ref = eServiceReference('%s FROM PROVIDERS ORDER BY name'%(self.service_types)) @@ -313,6 +401,29 @@ class ChannelSelectionBase(Screen): def cancel(self): self.close(None) + def getBouquetList(self): + serviceCount=0 + bouquets = [ ] + serviceHandler = eServiceCenter.getInstance() + list = serviceHandler.list(self.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)) + else: + serviceCount += 1 + if len(bouquets) == 0 and serviceCount > 0: + info = serviceHandler.info(self.bouquet_root) + if not info is None: + bouquets.append((info.getName(self.bouquet_root), self.bouquet_root)) + return bouquets + return None + class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): def __init__(self, session): ChannelSelectionBase.__init__(self,session) @@ -354,22 +465,23 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): 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): + self.setTvMode() 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) + self.session.nav.playService(lastservice) def onShow(self): ref = self.session.nav.getCurrentlyPlayingServiceReference() @@ -398,9 +510,9 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): self.zap() self.close(ref) - def setRoot(self, root): + def setRoot(self, root, justSet=False): if not self.movemode: - self.setRootBase(root) + self.setRootBase(root, justSet) #called from infoBar and channelSelected def zap(self): @@ -431,6 +543,101 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): if lastservice.valid() and self.getCurrentSelection() != lastservice: self.servicelist.setCurrent(lastservice) +class ServiceInfoWindow(Screen): + def __init__(self, session): + Screen.__init__(self, session) + self["Event_Now_StartTime"] = EventInfo(self.session.nav, EventInfo.Now_StartTime) + self["Event_Next_StartTime"] = EventInfo(self.session.nav, EventInfo.Next_StartTime) + self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now) + self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next) + self["Event_Now_Duration"] = EventInfo(self.session.nav, EventInfo.Now_Duration) + self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration) + +class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit): + def __init__(self, session): + ChannelSelectionBase.__init__(self, session) + ChannelSelectionEdit.__init__(self) + + config.radio = ConfigSubsection(); + config.radio.lastservice = configElement("config.radio.lastservice", configText, "", 0); + config.radio.lastroot = configElement("config.radio.lastroot", configText, "", 0); + self.onLayoutFinish.append(self.onCreate) + + self.info = session.instantiateDialog(ServiceInfoWindow) + + 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", "TvRadioActions"], + { + "keyTV": self.closeRadio, + "keyRadio": self.closeRadio, + "contextMenu": self.doContext, + "cancel": self.closeRadio, + "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 onCreate(self): + self.setRadioMode() + lastroot=eServiceReference(config.radio.lastroot.value) + if lastroot.valid(): + self.setRoot(lastroot) + else: + self.showFavourites() + self.saveRoot(self.getRoot()) + lastservice=eServiceReference(config.radio.lastservice.value) + if lastservice.valid(): + self.servicelist.setCurrent(lastservice) + self.session.nav.playService(lastservice) + self.servicelist.setPlayableIgnoreService(lastservice) + self.info.instance.show() + + def channelSelected(self): # just return selected service + ref = self.getCurrentSelection() + if self.movemode: + self.toggleMoveMarked() + elif (ref.flags & 7) == 7: + self.setRoot(ref) + elif self.bouquet_mark_edit: + self.doMark() + else: + self.session.nav.playService(ref) + self.servicelist.setPlayableIgnoreService(ref) + config.radio.lastservice.value = ref.toString() + config.radio.lastservice.save() + + def setRoot(self, root, justSet=False): + self.setRootBase(root, justSet) + + def closeRadio(self): + self.info.instance.hide() + lastroot=eServiceReference(config.radio.lastroot.value) + lastservice=eServiceReference(config.radio.lastservice.value) + if lastroot.valid() and self.getRoot() != lastroot: + self.setRoot(lastroot) + if lastservice.valid() and self.getCurrentSelection() != lastservice: + self.servicelist.setCurrent(lastservice) + #set previous tv service + lastservice=eServiceReference(config.tv.lastservice.value) + self.session.nav.playService(lastservice) + self.close(None) + class SimpleChannelSelection(ChannelSelectionBase): def __init__(self, session, title): ChannelSelectionBase.__init__(self, session) @@ -441,7 +648,7 @@ class SimpleChannelSelection(ChannelSelectionBase): def action(self, contexts, action): if not self.csel.enterBouquet(action): NumberActionMap.action(self, contexts, action) - self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], + self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions", "TvRadioActions"], { "cancel": self.cancel, "ok": self.channelSelected, @@ -449,6 +656,8 @@ class SimpleChannelSelection(ChannelSelectionBase): "showAllServices": self.showAllServices, "showProviders": self.showProviders, "showSatellites": self.showSatellites, + "keyRadio": self.setModeRadio, + "keyTV": self.setModeTv, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -463,14 +672,24 @@ class SimpleChannelSelection(ChannelSelectionBase): self["actions"].csel = self def onExecCallback(self): - print "onExecCallback" - self.showFavourites() self.session.currentDialog.instance.setTitle(self.title) + self.setModeTv() def channelSelected(self): # just return selected service ref = self.getCurrentSelection() - self.close(ref) + if (ref.flags & 7) == 7: + self.setRoot(ref) + else: + ref = self.getCurrentSelection() + self.close(ref) - def setRoot(self, root): - self.setRootBase(root) + def setRoot(self, root, justSet=False): + self.setRootBase(root, justSet) + def setModeTv(self): + self.setTvMode() + self.showFavourites() + + def setModeRadio(self): + self.setRadioMode() + self.showFavourites()