X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FChannelSelection.py;h=6a5605c713a1050c9074d2b93c2a55b693c189fa;hp=ff2928ecf14d1dab2f6df9cf69a29b2bf52ad636;hb=2b557e7ef4b0518736c5162a501cd9bc743930b3;hpb=075ad90b31e50c2b737acc6bc0b20ae6764ceffb diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index ff2928e..6a5605c 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -3,8 +3,9 @@ from Components.Button import Button from Components.ServiceList import ServiceList from Components.ActionMap import NumberActionMap, ActionMap from Components.MenuList import MenuList +from Components.ServiceEventTracker import ServiceEventTracker from EpgSelection import EPGSelection -from enigma import eServiceReference, eEPGCache, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer, eDVBDB +from enigma import eServiceReference, eEPGCache, eServiceCenter, eServiceCenterPtr, iMutableServiceListPtr, iStaticServiceInformationPtr, eTimer, eDVBDB, iPlayableService, iServiceInformation from Components.config import config, ConfigSubsection, ConfigText from Screens.FixedMenu import FixedMenu from Tools.NumericalTextInput import NumericalTextInput @@ -73,11 +74,13 @@ class ChannelContextMenu(Screen): current_sel_flags = csel.getCurrentSelection().flags inBouquetRootList = current_root and current_root.getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK inBouquet = csel.getMutableList() is not None - haveBouquets = csel.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') != -1 + haveBouquets = config.usage.multibouquet.value if not csel.bouquet_mark_edit and not csel.movemode: if not inBouquetRootList: - if (csel.getCurrentSelection().flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory: + flags = csel.getCurrentSelection().flags + isPlayable = not ((flags & eServiceReference.isMarker) or (flags & eServiceReference.isDirectory)) + if isPlayable: if config.ParentalControl.configured.value: if parentalControl.getProtectionLevel(csel.getCurrentSelection().toCompareString()) == -1: menu.append((_("add to parental protection"), boundFunction(self.addParentalProtection, csel.getCurrentSelection()))) @@ -90,7 +93,7 @@ class ChannelContextMenu(Screen): else: if haveBouquets: if not inBouquet and current_sel_path.find("PROVIDERS") == -1: - menu.append((_("copy to favourites"), self.copyCurrentToBouquetList)) + menu.append((_("copy to bouquets"), self.copyCurrentToBouquetList)) if current_sel_path.find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1: menu.append((_("remove all new found flags"), self.removeAllNewFoundFlags)) if inBouquet: @@ -151,7 +154,6 @@ class ChannelContextMenu(Screen): self.close() else: self.session.openWithCallback(self.close, MessageBox, _("The pin code you entered is wrong."), MessageBox.TYPE_ERROR) - def addServiceToBouquetSelected(self): bouquets = self.csel.getBouquetList() @@ -163,8 +165,6 @@ class ChannelContextMenu(Screen): self.bsel = self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.addCurrentServiceToBouquet) elif cnt == 1: # add to only one existing bouquet self.addCurrentServiceToBouquet(bouquets[0][1]) - else: #no bouquets in root.. so assume only one favourite list is used - self.addCurrentServiceToBouquet(self.csel.bouquet_root) def bouquetSelClosed(self, recursive): self.bsel = None @@ -188,7 +188,7 @@ class ChannelContextMenu(Screen): self.close() def addCurrentServiceToBouquet(self, dest): - self.csel.addCurrentServiceToBouquet(dest) + self.csel.addServiceToBouquet(dest) if self.bsel is not None: self.bsel.close(True) else: @@ -324,7 +324,6 @@ class ChannelSelectionEdit: str = '1:7:2:0:0:0:0:0:0:0:(type == 2) FROM BOUQUET \"userbouquet.%s.radio\" ORDER BY bouquet'%(self.buildBouquetID(bName)) new_bouquet_ref = eServiceReference(str) if not mutableBouquetList.addService(new_bouquet_ref): - self.bouquetNumOffsetCache = { } mutableBouquetList.flushChanges() eDVBDB.getInstance().reloadBouquets() mutableBouquet = serviceHandler.list(new_bouquet_ref).startEdit() @@ -334,13 +333,16 @@ class ChannelSelectionEdit: for service in services: if mutableBouquet.addService(service): print "add", service.toString(), "to new bouquet failed" - else: - current = self.servicelist.getCurrent() - if current and current.toString() == self.bouquet_rootstr: - self.servicelist.addService(service, True) mutableBouquet.flushChanges() else: print "get mutable list for new created bouquet failed" + # do some voodoo to check if current_root is equal to bouquet_root + cur_root = self.getRoot(); + str1 = cur_root.toString() + pos1 = str1.find("FROM BOUQUET") + pos2 = self.bouquet_rootstr.find("FROM BOUQUET") + if pos1 != -1 and pos2 != -1 and str1[pos1:] == self.bouquet_rootstr[pos2:]: + self.servicelist.addService(new_bouquet_ref) else: print "add", str, "to bouquets failed" else: @@ -357,6 +359,7 @@ class ChannelSelectionEdit: refstr = self.getCurrentSelection().toString() self.bouquetNumOffsetCache = { } pos = refstr.find('FROM BOUQUET "') + filename = None if pos != -1: refstr = refstr[pos+14:] pos = refstr.find('"') @@ -364,7 +367,8 @@ class ChannelSelectionEdit: filename = '/etc/enigma2/' + refstr[:pos] # FIXMEEE !!! HARDCODED /etc/enigma2 self.removeCurrentService() try: - remove(filename) + if filename is not None: + remove(filename) except OSError: print "error during remove of", filename @@ -376,7 +380,7 @@ class ChannelSelectionEdit: self.saved_title = self.instance.getTitle() pos = self.saved_title.find(')') new_title = self.saved_title[:pos+1] - if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') != -1: + if config.usage.multibouquet.value: new_title += ' ' + _("[bouquet edit]") else: new_title += ' ' + _("[favourite edit]") @@ -436,19 +440,29 @@ class ChannelSelectionEdit: mutableList.flushChanges() #FIXME dont flush on each single removed service self.servicelist.removeCurrent() - def addCurrentServiceToBouquet(self, dest): + def addServiceToBouquet(self, dest, service=None): mutableList = self.getMutableList(dest) if not mutableList is None: - if not mutableList.addService(self.servicelist.getCurrent()): + if service is None: #use current selected service + service = self.servicelist.getCurrent() + if not mutableList.addService(service): self.bouquetNumOffsetCache = { } mutableList.flushChanges() + # do some voodoo to check if current_root is equal to dest + cur_root = self.getRoot(); + str1 = cur_root.toString() + str2 = dest.toString() + pos1 = str1.find("FROM BOUQUET") + pos2 = str2.find("FROM BOUQUET") + if pos1 != -1 and pos2 != -1 and str1[pos1:] == str2[pos2:]: + self.servicelist.addService(service) def toggleMoveMode(self): if self.movemode: if self.entry_marked: self.toggleMoveMarked() # unmark current entry self.movemode = False - self.pathChangedDisabled = False # re-enable path change + self.pathChangeDisabled = False # re-enable path change self.mutableList.flushChanges() # FIXME add check if changes was made self.mutableList = None self.setTitle(self.saved_title) @@ -458,7 +472,7 @@ class ChannelSelectionEdit: else: self.mutableList = self.getMutableList() self.movemode = True - self.pathChangedDisabled = True # no path change allowed in movemode + self.pathChangeDisabled = True # no path change allowed in movemode self.saved_title = self.instance.getTitle() new_title = self.saved_title pos = self.saved_title.find(')') @@ -511,7 +525,7 @@ class ChannelSelectionBase(Screen): self.mode = MODE_TV - self.pathChangedDisabled = False + self.pathChangeDisabled = False self.bouquetNumOffsetCache = { } @@ -546,13 +560,12 @@ class ChannelSelectionBase(Screen): return ref def getBouquetNumOffset(self, bouquet): - if self.bouquet_root.getPath().find('FROM BOUQUET "bouquets.') == -1: #FIXME HACK + if not config.usage.multibouquet.value: return 0 bouquet = self.appendDVBTypes(bouquet) - try: - return self.bouquetNumOffsetCache[bouquet.toString()] - except: - offsetCount = 0 + str = bouquet.toString() + offsetCount = 0 + if not self.bouquetNumOffsetCache.has_key(str): serviceHandler = eServiceCenter.getInstance() bouquetlist = serviceHandler.list(self.bouquet_root) if not bouquetlist is None: @@ -561,7 +574,7 @@ class ChannelSelectionBase(Screen): if not bouquetIterator.valid(): #end of list break self.bouquetNumOffsetCache[bouquetIterator.toString()]=offsetCount - if ((bouquetIterator.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory): + if not (bouquetIterator.flags & eServiceReference.isDirectory): continue servicelist = serviceHandler.list(bouquetIterator) if not servicelist is None: @@ -572,7 +585,7 @@ class ChannelSelectionBase(Screen): if serviceIterator.flags: #playable services have no flags continue offsetCount += 1 - return self.bouquetNumOffsetCache.get(bouquet.toString(), offsetCount) + return self.bouquetNumOffsetCache.get(str, offsetCount) def recallBouquetMode(self): if self.mode == MODE_TV: @@ -710,7 +723,7 @@ class ChannelSelectionBase(Screen): return False def showAllServices(self): - if not self.pathChangedDisabled: + if not self.pathChangeDisabled: refstr = '%s ORDER BY name'%(self.service_types) if not self.preEnterPath(refstr): ref = eServiceReference(refstr) @@ -720,7 +733,7 @@ class ChannelSelectionBase(Screen): self.enterPath(ref) def showSatellites(self): - if not self.pathChangedDisabled: + if not self.pathChangeDisabled: refstr = '%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types) if not self.preEnterPath(refstr): ref = eServiceReference(refstr) @@ -769,12 +782,12 @@ class ChannelSelectionBase(Screen): n = ("%s (%d.%d" + h + ")") % (service_name, orbpos / 10, orbpos % 10) service.setName(n) self.servicelist.addService(service) - self.servicelist.finishFill() - if prev is not None: - self.setCurrentSelection(prev) + self.servicelist.finishFill() + if prev is not None: + self.setCurrentSelection(prev) def showProviders(self): - if not self.pathChangedDisabled: + if not self.pathChangeDisabled: refstr = '%s FROM PROVIDERS ORDER BY name'%(self.service_types) if not self.preEnterPath(refstr): ref = eServiceReference(refstr) @@ -787,9 +800,14 @@ class ChannelSelectionBase(Screen): self.enterPath(ref) def changeBouquet(self, direction): - if not self.pathChangedDisabled: - if self.isBasePathEqual(self.bouquet_root): - self.pathUp() + if not self.pathChangeDisabled: + if len(self.servicePath) > 1: + #when enter satellite root list we must do some magic stuff.. + ref = eServiceReference('%s FROM SATELLITES ORDER BY satellitePosition'%(self.service_types)) + if self.isBasePathEqual(ref): + self.showSatellites() + else: + self.pathUp() if direction < 0: self.moveUp() else: @@ -813,7 +831,7 @@ class ChannelSelectionBase(Screen): self.changeBouquet(-1) def showFavourites(self): - if not self.pathChangedDisabled: + if not self.pathChangeDisabled: if not self.preEnterPath(self.bouquet_rootstr): if self.isBasePathEqual(self.bouquet_root): self.pathUp() @@ -847,27 +865,41 @@ class ChannelSelectionBase(Screen): self.servicelist.setCurrent(service) def getBouquetList(self): - serviceCount=0 bouquets = [ ] serviceHandler = eServiceCenter.getInstance() + if config.usage.multibouquet.value: + list = serviceHandler.list(self.bouquet_root) + if list: + while True: + s = list.getNext() + if not s.valid(): + break + if s.flags & eServiceReference.isDirectory: + info = serviceHandler.info(s) + if info: + bouquets.append((info.getName(s), s)) + return bouquets + else: + info = serviceHandler.info(self.bouquet_root) + if info: + bouquets.append((info.getName(self.bouquet_root), self.bouquet_root)) + return bouquets + return None + + def getGroupList(self): + groups = [ ] + serviceHandler = eServiceCenter.getInstance() list = serviceHandler.list(self.bouquet_root) - if not list is None: + if list: while True: s = list.getNext() if not s.valid(): break - if ((s.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory): + if (s.flags & eServiceReference.isGroup) and (s.flags & eServiceReference.mustDescent): 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 + if info: + groups.append((info.getName(s), s)) + return groups def keyNumber0(self, num): if len(self.servicePath) > 1: @@ -922,7 +954,11 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect "keyTV": self.setModeTv, }) - self.onShown.append(self.__onShown) + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evStart: self.__evServiceStart, + iPlayableService.evEnd: self.__evServiceEnd + }) self.lastChannelRootTimer = eTimer() self.lastChannelRootTimer.timeout.get().append(self.__onCreate) @@ -937,6 +973,17 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect self.lastroot = config.tv.lastroot self.revertMode = None + def __evServiceStart(self): + service = self.session.nav.getCurrentService() + if service: + info = service.info() + if info: + refstr = info.getInfoString(iServiceInformation.sServiceref) + self.servicelist.setPlayableIgnoreService(eServiceReference(refstr)) + + def __evServiceEnd(self): + self.servicelist.setPlayableIgnoreService(eServiceReference()) + def setMode(self): self.restoreRoot() lastservice=eServiceReference(self.lastservice.value) @@ -976,14 +1023,6 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect if lastservice.valid(): self.zap() - def __onShown(self): - self.recallBouquetMode() - 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 channelSelected(self): ref = self.getCurrentSelection() if self.movemode: @@ -1004,7 +1043,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect if ref is None or ref != nref: self.session.nav.playService(nref) self.saveRoot() - self.saveChannel() + self.saveChannel(nref) config.servicelist.lastmode.save() self.addToHistory(nref) @@ -1047,7 +1086,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect self.setRoot(root) self.session.nav.playService(ref) self.setCurrentSelection(ref) - self.saveChannel() + self.saveChannel(ref) def saveRoot(self): path = '' @@ -1084,8 +1123,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect return True return False - def saveChannel(self): - ref = self.session.nav.getCurrentlyPlayingServiceReference() + def saveChannel(self, ref): if ref is not None: refstr = ref.toString() else: @@ -1169,6 +1207,23 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS "ok": self.channelSelected, }) + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evStart: self.__evServiceStart, + iPlayableService.evEnd: self.__evServiceEnd + }) + + def __evServiceStart(self): + service = self.session.nav.getCurrentService() + if service: + info = service.info() + if info: + refstr = info.getInfoString(iServiceInformation.sServiceref) + self.servicelist.setPlayableIgnoreService(eServiceReference(refstr)) + + def __evServiceEnd(self): + self.servicelist.setPlayableIgnoreService(eServiceReference()) + def saveRoot(self): path = '' for i in self.servicePathRadio: @@ -1211,7 +1266,6 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS if lastservice.valid(): self.servicelist.setCurrent(lastservice) self.session.nav.playService(lastservice) - self.servicelist.setPlayableIgnoreService(lastservice) self.info.show() def channelSelected(self): # just return selected service @@ -1226,7 +1280,6 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS 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()