X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/92c581769db1ebef1325d175e3b610be25317af1..00bcc7ce938eabe4494f821b543364544e4084b4:/lib/python/Screens/ChannelSelection.py diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index e7c67f3b..9cc6be7d 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -1,7 +1,7 @@ from Screen import Screen from Components.Button import Button from Components.ServiceList import ServiceList -from Components.ActionMap import NumberActionMap +from Components.ActionMap import NumberActionMap, ActionMap from EpgSelection import EPGSelection from enigma import eServiceReference, eEPGCache, eEPGCachePtr, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer from Components.config import config, configElement, ConfigSubsection, configText, currentConfigSelectionElement @@ -107,6 +107,21 @@ class ChannelContextMenu(FixedMenu): self.csel.endMarkedEdit(abort=True) self.close() +class ChannelSelectionEPG: + def __init__(self): + self["ChannelSelectEPGActions"] = ActionMap(["ChannelSelectEPGActions"], + { + "showEPGList": self.showEPGList, + }) + + def showEPGList(self): + ref=self.getCurrentSelection() + ptr=eEPGCache.getInstance() + if ptr.startTimeQuery(ref) != -1: + self.session.open(EPGSelection, ref) + else: + print 'no epg for service', ref.toString() + class ChannelSelectionEdit: def __init__(self): self.entry_marked = False @@ -117,6 +132,22 @@ class ChannelSelectionEdit: self.saved_title = None self.saved_root = None + class ChannelSelectionEditActionMap(ActionMap): + def __init__(self, csel, contexts = [ ], actions = { }, prio=0): + ActionMap.__init__(self, contexts, actions, prio) + self.csel = csel + def action(self, contexts, action): + if action == "cancel": + self.csel.handleEditCancel() + elif action == "ok": + pass # avoid typo warning... + else: + ActionMap.action(self, contexts, action) + self["ChannelSelectEditActions"] = ChannelSelectionEditActionMap(self, ["ChannelSelectEditActions", "OkCancelActions"], + { + "contextMenu": self.doContext, + }) + def getMutableList(self, root=eServiceReference()): if not self.mutableList is None: return self.mutableList @@ -207,6 +238,7 @@ class ChannelSelectionEdit: if self.entry_marked: self.toggleMoveMarked() # unmark current entry self.movemode = False + self.pathChangedDisabled = False # re-enable path change self.mutableList.flushChanges() # FIXME add check if changes was made self.mutableList = None self.instance.setTitle(self.saved_title) @@ -214,6 +246,7 @@ class ChannelSelectionEdit: else: self.mutableList = self.getMutableList() self.movemode = True + self.pathChangedDisabled = True # no path change allowed in movemode self.saved_title = self.instance.getTitle() new_title = self.saved_title new_title += ' ' + _("[move mode]"); @@ -261,6 +294,26 @@ class ChannelSelectionBase(Screen): self.servicePathTV = [ ] self.servicePathRadio = [ ] + self.pathChangedDisabled = False + + self["ChannelSelectBaseActions"] = NumberActionMap(["ChannelSelectBaseActions", "NumberActions"], + { + "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 + }) + def appendDVBTypes(self, ref): path = ref.getPath() pos = path.find(' FROM BOUQUET') @@ -297,15 +350,16 @@ class ChannelSelectionBase(Screen): if self.mode == MODE_TV: self.service_types = self.service_types_tv if currentConfigSelectionElement(config.usage.multibouquet) == "yes": - 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_rootstr = '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)) + self.bouquet_rootstr = '%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types) else: self.service_types = self.service_types_radio if currentConfigSelectionElement(config.usage.multibouquet) == "yes": - self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.radio" ORDER BY bouquet') + self.bouquet_rootstr = '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)) + self.bouquet_rootstr = '%s FROM BOUQUET "userbouquet.favourites.radio" ORDER BY bouquet'%(self.service_types) + self.bouquet_root = eServiceReference(self.bouquet_rootstr) def setTvMode(self): title = self.instance.getTitle() @@ -327,7 +381,7 @@ class ChannelSelectionBase(Screen): self.mode = MODE_RADIO self.recallBouquetMode() - def setRootBase(self, root, justSet=False): + def setRoot(self, root, justSet=False): path = root.getPath() inBouquetRootList = path.find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK pos = path.find(' FROM BOUQUET') @@ -362,10 +416,14 @@ class ChannelSelectionBase(Screen): def pathUp(self, justSet=False): if self.mode == MODE_TV: + print "MODE_TV" prev = self.servicePathTV.pop() + print "prev", prev.toString() length = len(self.servicePathTV) + print "length", length if length: current = self.servicePathTV[length-1] + print "current", current.toString() else: prev = self.servicePathRadio.pop() length = len(self.servicePathRadio) @@ -373,6 +431,7 @@ class ChannelSelectionBase(Screen): current = self.servicePathRadio[length-1] self.setRoot(current, justSet) if not justSet: + print "setCurrentSelection prev" self.setCurrentSelection(prev) return prev @@ -392,65 +451,88 @@ class ChannelSelectionBase(Screen): return True return False + def preEnterPath(self, refstr): + return False + def showAllServices(self): - ref = eServiceReference('%s ORDER BY name'%(self.service_types)) - self.clearPath() - self.enterPath(ref) + if not self.pathChangedDisabled: + refstr = '%s ORDER BY name'%(self.service_types) + if not self.preEnterPath(refstr): + ref = eServiceReference(refstr) + currentRoot = self.getRoot() + if currentRoot is None or currentRoot != ref: + self.clearPath() + self.enterPath(ref) def showSatellites(self): - justSet=False - prev = None - ref = eServiceReference('%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types)) - if self.isBasePathEqual(ref): - if self.isPrevPathEqual(ref): - justSet=True - prev = self.pathUp(justSet) - else: - justSet=True - self.clearPath() - self.enterPath(ref, True) - if justSet: - 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)) -# print service.toString() - self.servicelist.addService(service) - self.servicelist.finishFill() - if prev is not None: -# print "-->", prev.toString() - self.setCurrentSelection(prev) + if not self.pathChangedDisabled: + refstr = '%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types) + if not self.preEnterPath(refstr): + ref = eServiceReference(refstr) + justSet=False + prev = None + + if self.isBasePathEqual(ref): + if self.isPrevPathEqual(ref): + justSet=True + prev = self.pathUp(justSet) + else: + currentRoot = self.getRoot() + if currentRoot is None or currentRoot != ref: + justSet=True + self.clearPath() + self.enterPath(ref, True) + if justSet: + 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() + if prev is not None: + self.setCurrentSelection(prev) def showProviders(self): - ref = eServiceReference('%s FROM PROVIDERS ORDER BY name'%(self.service_types)) - if self.isBasePathEqual(ref): - self.pathUp() - else: - self.clearPath() - self.enterPath(ref) + if not self.pathChangedDisabled: + refstr = '%s FROM PROVIDERS ORDER BY name'%(self.service_types) + if not self.preEnterPath(refstr): + ref = eServiceReference(refstr) + if self.isBasePathEqual(ref): + self.pathUp() + else: + currentRoot = self.getRoot() + if currentRoot is None or currentRoot != ref: + self.clearPath() + self.enterPath(ref) def showFavourites(self): - if self.isBasePathEqual(self.bouquet_root): - self.pathUp() - else: - self.clearPath() - self.enterPath(self.bouquet_root) + if not self.pathChangedDisabled: + if not self.preEnterPath(self.bouquet_rootstr): + if self.isBasePathEqual(self.bouquet_root): + print "basepath equal" + self.pathUp() + else: + print "basepath not equal" + currentRoot = self.getRoot() + if currentRoot is None or currentRoot != self.bouquet_root: + self.clearPath() + self.enterPath(self.bouquet_root) def keyNumberGlobal(self, number): char = self.numericalTextInput.getKey(number) @@ -458,15 +540,6 @@ class ChannelSelectionBase(Screen): 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() @@ -477,13 +550,13 @@ class ChannelSelectionBase(Screen): servicepath = service.getPath() pos = servicepath.find(" FROM BOUQUET") if pos != -1: - servicepath = '(type == 1)' + servicepath[pos:] + if self.mode == MODE_TV: + servicepath = '(type == 1)' + servicepath[pos:] + else: + servicepath = '(type == 2)' + servicepath[pos:] service.setPath(servicepath) self.servicelist.setCurrent(service) - def cancel(self): - self.close(None) - def getBouquetList(self): serviceCount=0 bouquets = [ ] @@ -507,10 +580,11 @@ class ChannelSelectionBase(Screen): return bouquets return None -class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): +class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG): def __init__(self, session): ChannelSelectionBase.__init__(self,session) ChannelSelectionEdit.__init__(self) + ChannelSelectionEPG.__init__(self) #config for lastservice config.tv = ConfigSubsection(); @@ -519,35 +593,11 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): config.tv.prevservice = configElement("config.tv.prevservice", configText, "", 0); config.tv.prevroot = configElement("config.tv.prevroot", 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"], + self["actions"] = ActionMap(["OkCancelActions"], { "cancel": self.cancel, "ok": self.channelSelected, - "mark": self.doMark, - "contextMenu": self.doContext, - "showFavourites": self.showFavourites, - "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.onShown.append(self.onShow) self.lastChannelRootTimer = eTimer() @@ -571,14 +621,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): else: self.servicelist.setPlayableIgnoreService(eServiceReference()) - def showEPGList(self): - ref=self.getCurrentSelection() - ptr=eEPGCache.getInstance() - if ptr.startTimeQuery(ref) != -1: - self.session.open(EPGSelection, ref) - else: - print 'no epg for service', ref.toString() - def channelSelected(self): ref = self.getCurrentSelection() if self.movemode: @@ -591,13 +633,10 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): self.zap() self.close(ref) - def setRoot(self, root, justSet=False): - if not self.movemode: - self.setRootBase(root, justSet) - #called from infoBar and channelSelected def zap(self): - if self.session.nav.getCurrentlyPlayingServiceReference() != self.getCurrentSelection(): + ref = self.session.nav.getCurrentlyPlayingServiceReference() + if ref is None or ref != self.getCurrentSelection(): self.session.nav.playService(self.getCurrentSelection()) self.saveRoot() self.saveChannel() @@ -629,6 +668,17 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): self.showFavourites() self.saveRoot() + def preEnterPath(self, refstr): + if len(self.servicePathTV) and self.servicePathTV[0] != eServiceReference(refstr): + pathstr = config.tv.lastroot.value + if pathstr is not None and pathstr.find(refstr) == 0: + self.restoreRoot() + lastservice=eServiceReference(config.tv.lastservice.value) + if lastservice is not None: + self.setCurrentSelection(lastservice) + return True + return False + def saveChannel(self): ref = self.session.nav.getCurrentlyPlayingServiceReference() if ref is not None: @@ -667,57 +717,36 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit): if lastservice.valid() and self.getCurrentSelection() != lastservice: self.setCurrentSelection(lastservice) -class ServiceInfoWindow(Screen): +from Screens.InfoBarGenerics import InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord + +class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord): def __init__(self, session): Screen.__init__(self, session) - self["Service_Name"] = ServiceName(self.session.nav) + InfoBarEvent.__init__(self) + InfoBarServiceName.__init__(self) + InfoBarInstantRecord.__init__(self) self["Clock"] = Clock() - 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): + +class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG): def __init__(self, session): ChannelSelectionBase.__init__(self, session) ChannelSelectionEdit.__init__(self) + ChannelSelectionEPG.__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) + self.info = session.instantiateDialog(RadioInfoBar) - 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"], + self["actions"] = ActionMap(["OkCancelActions", "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 saveRoot(self): path = '' @@ -743,6 +772,17 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit): self.showFavourites() self.saveRoot() + def preEnterPath(self, refstr): + if len(self.servicePathRadio) and self.servicePathRadio[0] != eServiceReference(refstr): + pathstr = config.radio.lastroot.value + if pathstr is not None and pathstr.find(refstr) == 0: + self.restoreRoot() + lastservice=eServiceReference(config.radio.lastservice.value) + if lastservice is not None: + self.setCurrentSelection(lastservice) + return True + return False + def onCreate(self): self.setRadioMode() self.restoreRoot() @@ -762,16 +802,14 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit): elif self.bouquet_mark_edit: self.doMark() else: - if self.session.nav.getCurrentlyPlayingServiceReference() != ref: + playingref = self.session.nav.getCurrentlyPlayingServiceReference() + if playingref is None or playingref != ref: self.session.nav.playService(ref) self.servicelist.setPlayableIgnoreService(ref) config.radio.lastservice.value = ref.toString() config.radio.lastservice.save() self.saveRoot() - def setRoot(self, root, justSet=False): - self.setRootBase(root, justSet) - def closeRadio(self): self.info.instance.hide() #set previous tv service @@ -785,32 +823,13 @@ class SimpleChannelSelection(ChannelSelectionBase): 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", "TvRadioActions"], + self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"], { "cancel": self.cancel, "ok": self.channelSelected, - "showFavourites": self.showFavourites, - "showAllServices": self.showAllServices, - "showProviders": self.showProviders, - "showSatellites": self.showSatellites, "keyRadio": self.setModeRadio, "keyTV": self.setModeTv, - "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): self.session.currentDialog.instance.setTitle(self.title) @@ -824,9 +843,6 @@ class SimpleChannelSelection(ChannelSelectionBase): ref = self.getCurrentSelection() self.close(ref) - def setRoot(self, root, justSet=False): - self.setRootBase(root, justSet) - def setModeTv(self): self.setTvMode() self.showFavourites()