from Components.Button import Button
from Components.ServiceList import ServiceList
from Components.ActionMap import ActionMap
+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
-from enigma import eServiceReference
+import xml.dom.minidom
-from Screens.Menu import FixedMenu
+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"
-import xml.dom.minidom
+ def bouquetSelected(self):
+ self.parent.addCurrentServiceToBouquet(self["menu"].getCurrent()[2])
+ self.close()
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 = [ ]
+
+ #HACK
+ inBouquetRootList = csel["list"].getRoot().toString().find('FROM BOUQUET "bouquets.') != -1
+ 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"
- 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 1:
+ s = list.getNext()
+ if not s.valid():
+ break
+ if ((s.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
+ info = serviceHandler.info(s)
+ if not info is None:
+ str = info.getName(s)
+ bouquets.append((str, 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()
+
+ def toggleMoveMode(self):
+ self.csel.toggleMoveMode()
+ self.close()
+
def bouquetMarkStart(self):
self.csel.startMarkedEdit()
self.close()
-
+
def bouquetMarkEnd(self):
self.csel.endMarkedEdit(abort=False)
self.close()
self.close()
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)
-
+
+ #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
-
- ## 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.mutableList = None
+
self.__marked = [ ]
-
+
self["key_red"] = Button("All")
- self["key_green"] = Button("ARD")
- self["key_yellow"] = Button("ZDF")
- self["key_blue"] = Button("Custom")
+ self["key_green"] = Button("Provider")
+ self["key_yellow"] = Button("Satellite")
+ self["key_blue"] = Button("Favourites")
self["list"] = ServiceList()
- self["list"].setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
-
+
+ if config.tv.lastroot.value == "":
+ self["list"].setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
#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":
- print "setting root to " + action[8:]
- 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
+ list = l["list"]
+ 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:
+ 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)
- self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions"],
+ self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
{
"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
- # marked edit mode
-
+ def showEPGList(self):
+ ref=self["list"].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["list"].getRoot()
+ list = serviceHandler.list(root)
+ mutableList = None
+ if list is not None:
+ mutableList = list.startEdit()
+ return mutableList
+
+# multiple marked entry stuff ( edit mode, later multiepg selection )
def startMarkedEdit(self):
- self.bouquet_mark_edit = True
- self.clearMarks()
-
- # TODO
- marked = self.__marked
-
+ self.mutableList = self.getMutableList()
l = self["list"]
- for x in marked:
- print "mark: " + str(x)
- l.addMarked(x)
-
- def endMarkedEdit(self, abort):
+ # add all services from the current list to internal marked set in listboxservicecontent
+ self.bouquetRoot = l.getRoot()
+ self.clearMarks() # this clears the internal marked set in the listboxservicecontent
self.bouquet_mark_edit = True
- new_marked = self["list"].getMarked()
- self.__marked = new_marked
+ self.__marked = l.getRootServices()
+ for x in self.__marked:
+ l.addMarked(eServiceReference(x))
+
+ def endMarkedEdit(self, abort):
+ l = self["list"]
+ if not abort and self.mutableList is not None:
+ new_marked = set(l.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["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):
- self.session.nav.playService(self["list"].getCurrent())
- print "current: " + self["list"].getCurrent().toString()
+
+ def removeCurrentService(self):
+ l = self["list"]
+ ref = l.getCurrent()
+ mutableList = self.getMutableList()
+ if ref.valid() and mutableList is not None:
+ if mutableList.removeService(ref) == 0:
+ mutableList.flushChanges() #FIXME dont flush on each single removed service
+ self.setRoot(l.getRoot())
+
+ def addCurrentServiceToBouquet(self, dest):
+ mutableList = self.getMutableList(dest)
+ if not mutableList is None:
+ if mutableList.addService(self["list"].getCurrent()) == 0:
+ mutableList.flushChanges()
self.close()
+ def findService(self, serviceHandler, num, bouquet):
+ list = serviceHandler.list(bouquet)
+ if not list is None:
+ while num > 0:
+ s = list.getNext()
+ if not s.valid():
+ break
+ if s.flags != 0: #assume normal dvb service have no flags set
+ continue
+ num = num - 1;
+ if num == 0:
+ return s, 0
+ return None, num
+
+ def zapToNumber(self, number):
+ bouquet = None
+ service = None
+ serviceHandler = eServiceCenter.getInstance()
+ if self.bouquet_root.toString().find('FROM BOUQUET "bouquets.') == -1:
+ service, number = self.findService(serviceHandler, number, self.bouquet_root)
+ bouquet = self.bouquet_root
+ else:
+ list = serviceHandler.list(self.bouquet_root)
+ if not list is None:
+ while number:
+ s = list.getNext()
+ if not s.valid():
+ break
+ bouquet = s
+ service, number = self.findService(serviceHandler, number, s)
+ if not service is None:
+ self.session.nav.playService(service)
+ if not bouquet is None:
+ if self["list"].getRoot() != bouquet:
+ self.setRoot(bouquet)
+ self.setCurrent(service)
+
+ def setCurrent(self, service):
+ self["list"].setCurrent(service)
+
+ def getBouquetNumOffset(self, bouquet):
+ if self.bouquet_root.toString().find('FROM BOUQUET "bouquets.') == -1:
+ return 0
+ offset=0
+ serviceHandler = eServiceCenter.getInstance()
+ list = serviceHandler.list(self.bouquet_root)
+ if not list is None:
+ while 1:
+ s = list.getNext()
+ if not s.valid() or s == bouquet:
+ break
+ if ((s.flags & eServiceReference.flagDirectory) != eServiceReference.flagDirectory):
+ continue
+ slist = serviceHandler.list(s)
+ if not slist is None:
+ while 1:
+ ss = slist.getNext()
+ if not ss.valid():
+ break
+ if ss.flags != 0:
+ continue
+ offset = offset + 1
+ return offset
+
+ def setRoot(self, root):
+ if not self.movemode: # dont change root when movemode is enabled
+ list = self["list"]
+
+ #HACK
+ inBouquetRootList = root.toString().find('FROM BOUQUET "bouquets.') != -1
+
+ if not inBouquetRootList and ((root.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
+ list.setMode(list.MODE_FAVOURITES)
+ offset = self.getBouquetNumOffset(root)
+ list.setNumberOffset(offset)
+ else:
+ list.setMode(list.MODE_NORMAL)
+ list.setRoot(root)
+
+ def channelSelected(self):
+ ref = self["list"].getCurrent()
+ if self.movemode:
+ if self.entry_marked:
+ self["list"].setCurrentMarked(False)
+ self.entry_marked = False
+ else:
+ self["list"].setCurrentMarked(True)
+ self.entry_marked = True
+ elif (ref.flags & 7) == 7:
+ self.setRoot(ref)
+ elif self.bouquet_mark_edit:
+ self.doMark()
+ else:
+ self.session.nav.playService(ref)
+ self.saveChannel()
+ self.close()
+
#called from infoBar
def zap(self):
self.session.nav.playService(self["list"].getCurrent())
+ self.saveChannel()
def moveUp(self):
self["list"].moveUp()
def doContext(self):
self.session.open(ChannelContextMenu, self)
- def setMoveMode(self, mode):
- self.movemode = mode
-
+ def toggleMoveMode(self):
+ if self.movemode:
+ if self.entry_marked:
+ self.channelSelected() # 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 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()
git.cweiske.de / enigma2.git / blobdiff