From: Andreas Monzner Date: Mon, 2 Jan 2006 11:45:49 +0000 (+0000) Subject: add two native python epg views X-Git-Tag: 2.6.0~4551 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1213cbcff4f8b31aa77825325f102a134d246e0a add two native python epg views --- diff --git a/data/keymap.xml b/data/keymap.xml index ab058568..c6702857 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -197,6 +197,8 @@ + + diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 6ab3f748..b7288792 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -2,14 +2,74 @@ from HTMLComponent import * from GUIComponent import * from enigma import * +from re import * +from time import localtime, time +from ServiceReference import ServiceReference + +EPG_TYPE_SINGLE = 0 +EPG_TYPE_MULTI = 1 + +RT_HALIGN_LEFT = 0 +RT_HALIGN_RIGHT = 1 +RT_HALIGN_CENTER = 2 +RT_HALIGN_BLOCK = 4 + +RT_VALIGN_TOP = 0 +RT_VALIGN_CENTER = 8 +RT_VALIGN_BOTTOM = 16 + +RT_WRAP = 32 + +SINGLE_CPP = 0 + +class Rect: + def __init__(self, x, y, width, height): + self.__left = x + self.__top = y + self.__width = width + self.__height = height + + def left(self): + return self.__left + + def top(self): + return self.__top + + def height(self): + return self.__height + + def width(self): + return self.__width class EPGList(HTMLComponent, GUIComponent): - def __init__(self): + def __init__(self, type=EPG_TYPE_SINGLE): GUIComponent.__init__(self) - self.l = eListboxEPGContent() + self.type=type + if type == EPG_TYPE_SINGLE and SINGLE_CPP > 0: + self.l = eListboxEPGContent() + else: + self.l = eListboxPythonMultiContent() + self.epgcache = eEPGCache.getInstance() + + def getEventFromId(self, service, eventid): + event = None + if self.epgcache is not None and eventid is not None: + event = self.epgcache.lookupEventId(service.ref, eventid) + return event def getCurrent(self): - evt = self.l.getCurrent() + if self.type == EPG_TYPE_SINGLE: + if SINGLE_CPP > 0: + evt = self.l.getCurrent() + else: + eventid = self.l.getCurrentSelection()[0] + evt = self.getEventFromId(self.service, eventid) + else: + tmp = self.l.getCurrentSelection()[0] + eventid = tmp[0] + service = ServiceReference(tmp[1]) + event = self.getEventFromId(service, eventid) + evt = ( event, service ) return evt def moveUp(self): @@ -21,23 +81,132 @@ class EPGList(HTMLComponent, GUIComponent): def GUIcreate(self, parent): self.instance = eListbox(parent) self.instance.setContent(self.l) + if SINGLE_CPP > 0: + self.instance.setItemHeight(25) def GUIdelete(self): self.instance = None - def setRoot(self, root): - self.l.setRoot(root) - self.l.sort() - -# def setMode(self, mode): -# if mode == self.MODE_NORMAL: -# self.instance.setItemHeight(20) -# self.l.setVisualMode(eListboxServiceContent.visModeSimple) -# else: -# self.instance.setItemHeight(40) -# self.l.setElementFont(self.l.celServiceName, gFont("Regular", 30)) -# self.l.setElementPosition(self.l.celServiceName, eRect(40, 0, self.instance.size().width(), 40)) -# self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20)) -# self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 10, 40, 30)) -# -# self.l.setVisualMode(eListboxServiceContent.visModeComplex) + def recalcEntrySize(self): + t = time() + esize = self.l.getItemSize() + self.l.setFont(0, gFont("Regular", 22)) + self.l.setFont(1, gFont("Regular", 16)) + width = esize.width() + height = esize.height() + if self.type == EPG_TYPE_SINGLE: + w = width/20*5 + self.datetime_rect = Rect(0,0, w, height) + self.descr_rect = Rect(w, 0, width/20*15, height) + else: + xpos = 0; + w = width/10*3; + self.service_rect = Rect(xpos, 0, w-10, height) + xpos += w; + w = width/10*2; + self.start_end_rect = Rect(xpos, 0, w-10, height) + self.progress_rect = Rect(xpos, 4, w-10, height-8) + xpos += w + w = width/10*5; + self.descr_rect = Rect(xpos, 0, width, height) + print "recalcEntrySize", time() - t + + def buildSingleEntry(self, eventId, beginTime, duration, EventName): + r1=self.datetime_rect + r2=self.descr_rect + res = [ eventId ] + t = localtime(beginTime) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4]))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName)) + return res + + def buildMultiEntry(self, service, eventId, begTime, duration, EventName, nowTime, service_name): + sname = service_name + r1=self.service_rect + r2=self.progress_rect + r3=self.descr_rect + r4=self.start_end_rect + res = [ (eventId, service, begTime, duration) ] + re = compile('\xc2\x86.*?\xc2\x87') + list = re.findall(sname) + if len(list): + sname='' + for substr in list: + sname+=substr[2:len(substr)-2] + if len(sname) == 0: + sname = service_name; + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, sname)) + if begTime is not None: + if nowTime < begTime: + begin = localtime(begTime) + end = localtime(begTime+duration) +# print "begin", begin +# print "end", end + res.append((eListboxPythonMultiContent.TYPE_TEXT, r4.left(), r4.top(), r4.width(), r4.height(), 1, RT_HALIGN_CENTER|RT_VALIGN_CENTER, "%02d.%02d - %02d.%02d"%(begin[3],begin[4],end[3],end[4]))); + res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName)) + else: + percent = (nowTime - begTime) * 100 / duration + res.append((eListboxPythonMultiContent.TYPE_PROGRESS, r2.left(), r2.top(), r2.width(), r2.height(), percent)); + res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName)) + return res + + def queryEPG(self, list, buildFunc=None): + if self.epgcache is not None: + if buildFunc is not None: + return self.epgcache.lookupEvent(list, buildFunc) + else: + return self.epgcache.lookupEvent(list) + return [ ] + + def fillMultiEPG(self, services): + t = time() + test = [ 'RIBDTCN' ] + for service in services: + tuple = ( service.ref.toString(), 0 ) + test.append( tuple ) +# self.list = self.queryEPG(test, self.buildMultiEntry) + tmp = self.queryEPG(test) + self.list = [ ] + for x in tmp: + self.list.append(self.buildMultiEntry(x[0], x[1], x[2], x[3], x[4], x[5], x[6])) + self.l.setList(self.list) + print time() - t + + def updateMultiEPG(self, direction): + t = time() + test = [ 'RIBDTCN' ] + for x in self.list: + data = x[0] + service = data[1] + begTime = data[2] + duration = data[3] + new_stime = 0 + if begTime is not None: + if direction > 0: + new_stime = begTime+duration+120 + else: + new_stime = begTime-120 + test.append((service, 0, new_stime)) + self.list = self.queryEPG(test, self.buildMultiEntry) +# tmp = self.queryEPG(test) +# self.list = [ ] +# for x in tmp: +# self.list.append(self.buildMultiEntry(x[0], x[1], x[2], x[3], x[4], x[5], x[6])) + self.l.setList(self.list) + print time() - t + + def fillSingleEPG(self, service): + t = time() + if SINGLE_CPP > 0: + self.l.setRoot(service.ref) + else: + self.service = service + test = [ 'IBDT', (service.ref.toString(), 0, -1, -1) ] +# self.list = self.queryEPG(test, self.buildSingleEntry) + tmp = self.queryEPG(test) + self.list = [ ] + for x in tmp: + self.list.append(self.buildSingleEntry(x[0], x[1], x[2], x[3])) +# self.list.append(self.buildSingleEntry(refstr, x[0], x[1], x[2], x[3])) + self.l.setList(self.list) + print time() - t diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 45de7abd..8eb8b887 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -12,8 +12,8 @@ from Components.NimManager import nimmanager 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])) @@ -21,8 +21,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): @@ -68,21 +67,13 @@ class ChannelContextMenu(FixedMenu): 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]) else: #no bouquets in root.. so assume only one favourite list is used @@ -370,6 +361,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) diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index efdd0f1b..6f556003 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -1,6 +1,6 @@ from Screen import Screen from Components.Button import Button -from Components.EpgList import EPGList +from Components.EpgList import * from Components.ActionMap import ActionMap from Screens.EventView import EventView from enigma import eServiceReference, eServiceEventPtr @@ -13,60 +13,107 @@ from ServiceReference import ServiceReference import xml.dom.minidom class EPGSelection(Screen): - def __init__(self, session, root): + def __init__(self, session, service): Screen.__init__(self, session) - self["list"] = EPGList() + self["key_red"] = Button("") + self["key_green"] = Button(_("Add timer")) + + if isinstance(service, eServiceReference): + self.type = EPG_TYPE_SINGLE + self["key_yellow"] = Button() + self["key_blue"] = Button() + self.currentService=ServiceReference(service) + else: + self.type = EPG_TYPE_MULTI + self["key_yellow"] = Button(_("Prev")) + self["key_blue"] = Button(_("Next")) + self.services = service + + self["list"] = EPGList(self.type) class ChannelActionMap(ActionMap): def action(self, contexts, action): - ActionMap.action(self, contexts, action) - - self["key_red"] = Button("") - self["key_green"] = Button(_("Add timer")) - self["key_yellow"] = Button("") - self["key_blue"] = Button("") + ActionMap.action(self, contexts, action) - self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], + self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], { "cancel": self.close, "ok": self.eventSelected, - "timerAdd": self.timerAdd + "timerAdd": self.timerAdd, + "yellow": self.yellowButtonPressed, + "blue": self.blueButtonPressed }) self["actions"].csel = self - self.setRoot(root) - def eventViewCallback(self, setEvent, val): + self.onLayoutFinish.append(self.onCreate) + + #just used in multipeg + def onCreate(self): + l = self["list"] + if self.type == EPG_TYPE_MULTI: + l.recalcEntrySize() + l.fillMultiEPG(self.services) + else: + if SINGLE_CPP == 0: + l.recalcEntrySize() + l.fillSingleEPG(self.currentService) + + def eventViewCallback(self, setEvent, setService, val): + l = self["list"] + old = l.getCurrent() if val == -1: self.moveUp() - setEvent(self["list"].getCurrent()) elif val == +1: self.moveDown() - setEvent(self["list"].getCurrent()) + cur = l.getCurrent() + if self.type == EPG_TYPE_SINGLE: + setEvent(cur) + else: + if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref: + self.eventViewCallback(setEvent, setService, val) + else: + setEvent(cur[0]) + setService(cur[1]) def eventSelected(self): - event = self["list"].getCurrent() - self.session.open(EventView, event, self.currentService, self.eventViewCallback) - + if self.type == EPG_TYPE_SINGLE: + event = self["list"].getCurrent() + service = self.currentService + else: # EPG_TYPE_MULTI + cur = self["list"].getCurrent() + event = cur[0] + service = cur[1] + if event is not None: + self.session.open(EventView, event, service, self.eventViewCallback) + + def yellowButtonPressed(self): + if self.type == EPG_TYPE_MULTI: + self["list"].updateMultiEPG(-1) + + def blueButtonPressed(self): + if self.type == EPG_TYPE_MULTI: + self["list"].updateMultiEPG(1) + def timerAdd(self): - event = self["list"].getCurrent() - + if self.type == EPG_TYPE_SINGLE: + event = self["list"].getCurrent() + serviceref = self.currentService + else: + cur = self["list"].getCurrent() + event = cur[0] + serviceref = cur[1] if event is None: return - - newEntry = RecordTimerEntry(self.currentService, *parseEvent(event)) + newEntry = RecordTimerEntry(serviceref, *parseEvent(event)) self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry) - + def timerEditFinished(self, answer): if (answer[0]): self.session.nav.RecordTimer.record(answer[1]) else: print "Timeredit aborted" - def setRoot(self, root): - self.currentService=ServiceReference(root) - self["list"].setRoot(root) - def moveUp(self): self["list"].moveUp() diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py index e3585b67..d96be6d6 100644 --- a/lib/python/Screens/EventView.py +++ b/lib/python/Screens/EventView.py @@ -11,7 +11,8 @@ class EventView(Screen): def __init__(self, session, Event, Ref, callback=None): Screen.__init__(self, session) self.cbFunc = callback - self.currentService=None + self.currentService=Ref + self.event = Event self["epg_description"] = ScrollLabel() self["datetime"] = Label() self["channel"] = Label() @@ -26,17 +27,20 @@ class EventView(Screen): "nextEvent": self.nextEvent, "timerAdd": self.timerAdd }) - self.setEvent(Event) - self.setService(Ref) + self.onShown.append(self.onCreate) + + def onCreate(self): + self.setEvent(self.event) + self.setService(self.currentService) def prevEvent(self): if self.cbFunc is not None: - self.cbFunc(self.setEvent, -1) + self.cbFunc(self.setEvent, self.setService, -1) def nextEvent(self): if self.cbFunc is not None: - self.cbFunc(self.setEvent, +1) - + self.cbFunc(self.setEvent, self.setService, +1) + def timerAdd(self): newEntry = RecordTimerEntry(self.currentService, *parseEvent(self.event)) self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry) diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index a659b5be..e3fa423f 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -5,7 +5,7 @@ from Components.Label import * from Components.ProgressBar import * from Components.config import configfile, configsequencearg from Components.config import config, configElement, ConfigSubsection, configSequence -from ChannelSelection import ChannelSelection +from ChannelSelection import ChannelSelection, BouquetSelector from Components.Pixmap import Pixmap, PixmapConditional from Components.BlinkingPixmap import BlinkingPixmapConditional @@ -362,7 +362,34 @@ class InfoBarEPG: }) def showEPGList(self): - ref=self.session.nav.getCurrentlyPlayingServiceReference() + bouquets = self.servicelist.getBouquetList() + if bouquets is None: + cnt = 0 + else: + cnt = len(bouquets) + if cnt > 1: # show bouquet list + self.session.open(BouquetSelector, bouquets, self.openBouquetEPG) + elif cnt == 1: # add to only one existing bouquet + self.openBouquetEPG(bouquets[0][1]) + else: #no bouquets so we open single epg + self.openSingleEPGSelector(self.session.nav.getCurrentlyPlayingServiceReference()) + + def openBouquetEPG(self, bouquet): + ptr=eEPGCache.getInstance() + services = [ ] + servicelist = eServiceCenter.getInstance().list(bouquet) + if not servicelist is None: + while True: + service = servicelist.getNext() + if not service.valid(): #check if end of list + break + if service.flags: #ignore non playable services + continue + services.append(ServiceReference(service)) + if len(services): + self.session.open(EPGSelection, services) + + def openSingleEPGSelector(self, ref): ptr=eEPGCache.getInstance() if ptr.startTimeQuery(ref) != -1: self.session.open(EPGSelection, ref) @@ -383,7 +410,7 @@ class InfoBarEPG: except: pass - def eventViewCallback(self, setEvent, val): #used for now/next displaying + def eventViewCallback(self, setEvent, setService, val): #used for now/next displaying if len(self.epglist) > 1: tmp = self.epglist[0] self.epglist[0]=self.epglist[1]