X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c8599be3a4e4fed4613dae1baf9e213c344ecf18..aa08b13bdb747f08cb3be5d7549f275eca7a0114:/lib/python/Components/EpgList.py diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index e0f6f902..0c4290d6 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -1,8 +1,9 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent + +from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \ + RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER -from enigma import * -from re import * from time import localtime, time from ServiceReference import ServiceReference from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE @@ -11,19 +12,6 @@ EPG_TYPE_SINGLE = 0 EPG_TYPE_MULTI = 1 EPG_TYPE_SIMILAR = 2 -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 @@ -52,18 +40,16 @@ class EPGList(HTMLComponent, GUIComponent): self.onSelChanged.append(selChangedCB) GUIComponent.__init__(self) self.type=type - if type == EPG_TYPE_SINGLE and SINGLE_CPP > 0: - self.l = eListboxEPGContent() + self.l = eListboxPythonMultiContent() + if type == EPG_TYPE_SINGLE: + self.l.setBuildFunc(self.buildSingleEntry) + elif type == EPG_TYPE_MULTI: + self.l.setBuildFunc(self.buildMultiEntry) else: - self.l = eListboxPythonMultiContent() - if type == EPG_TYPE_SINGLE: - self.l.setBuildFunc(self.buildSingleEntry) - elif type == EPG_TYPE_MULTI: - self.l.setBuildFunc(self.buildMultiEntry) - else: - assert(type == EPG_TYPE_SIMILAR) - self.l.setBuildFunc(self.buildSimilarEntry) + assert(type == EPG_TYPE_SIMILAR) + self.l.setBuildFunc(self.buildSimilarEntry) self.epgcache = eEPGCache.getInstance() + self.clock_pixmap = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')) def getEventFromId(self, service, eventid): event = None @@ -72,37 +58,21 @@ class EPGList(HTMLComponent, GUIComponent): return event def getCurrentChangeCount(self): - if self.type == EPG_TYPE_SINGLE: - return 0 - return self.l.getCurrentSelection()[0] + if self.type == EPG_TYPE_MULTI: + return self.l.getCurrentSelection()[0] + return 0 def getCurrent(self): - if self.type == EPG_TYPE_SINGLE: - if SINGLE_CPP > 0: - evt = self.l.getCurrent() - else: - cur = self.l.getCurrentSelection() - if cur is None: - return cur - else: - evt = self.getEventFromId(self.service, cur[0]) - elif self.type == EPG_TYPE_MULTI: - tmp = self.l.getCurrentSelection() - if tmp is None: - return ( None, None ) - eventid = tmp[2] - service = ServiceReference(tmp[1]) - event = self.getEventFromId(service, eventid) - evt = ( event, service ) - else: - tmp = self.l.getCurrentSelection() - if tmp is None: - return ( None, None ) - eventid = tmp[1] - service = ServiceReference(tmp[0]) - event = self.getEventFromId(service, eventid) - evt = ( event, service ) - return evt + idx=0 + if self.type == EPG_TYPE_MULTI: + idx += 1 + tmp = self.l.getCurrentSelection() + if tmp is None: + return ( None, None ) + eventid = tmp[idx+1] + service = ServiceReference(tmp[idx]) + event = self.getEventFromId(service, eventid) + return ( event, service ) def moveUp(self): self.instance.moveSelection(self.instance.moveUp) @@ -128,44 +98,39 @@ class EPGList(HTMLComponent, GUIComponent): GUI_WIDGET = eListbox - def createWidget(self, parent): - l = eListbox(parent) - l.setWrapAround(True) - l.selectionChanged.get().append(self.selectionChanged) - l.setContent(self.l) - if SINGLE_CPP > 0: - l.setItemHeight(25) - return l + def postWidgetCreate(self, instance): + instance.setWrapAround(True) + instance.selectionChanged.get().append(self.selectionChanged) + instance.setContent(self.l) def recalcEntrySize(self): - if SINGLE_CPP == 0: - 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: - self.weekday_rect = Rect(0, 0, width/20*2-10, height) - self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) - self.descr_rect = Rect(width/20*7, 0, width/20*13, height) - elif self.type == EPG_TYPE_MULTI: - 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) - else: # EPG_TYPE_SIMILAR - self.weekday_rect = Rect(0, 0, width/20*2-10, height) - self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) - self.service_rect = Rect(width/20*7, 0, width/20*13, height) + 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: + self.weekday_rect = Rect(0, 0, width/20*2-10, height) + self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) + self.descr_rect = Rect(width/20*7, 0, width/20*13, height) + elif self.type == EPG_TYPE_MULTI: + 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) + else: # EPG_TYPE_SIMILAR + self.weekday_rect = Rect(0, 0, width/20*2-10, height) + self.datetime_rect = Rect(width/20*2, 0, width/20*5-15, height) + self.service_rect = Rect(width/20*7, 0, width/20*13, height) - def buildSingleEntry(self, eventId, beginTime, duration, EventName): - rec=(self.timer.isInTimer(eventId, beginTime, duration, self.service) > ((duration/10)*8)) + def buildSingleEntry(self, service, eventId, beginTime, duration, EventName): + rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) r1=self.weekday_rect r2=self.datetime_rect r3=self.descr_rect @@ -174,7 +139,7 @@ class EPGList(HTMLComponent, GUIComponent): res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, self.days[t[6]])) res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4]))) if rec: - res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, self.clock_pixmap)) res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName)) else: res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName)) @@ -190,7 +155,7 @@ class EPGList(HTMLComponent, GUIComponent): res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, self.days[t[6]])) res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4]))) if rec: - res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, self.clock_pixmap)) res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, service_name)) else: res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, service_name)) @@ -198,25 +163,16 @@ class EPGList(HTMLComponent, GUIComponent): def buildMultiEntry(self, changecount, service, eventId, begTime, duration, EventName, nowTime, service_name): rec=begTime and (self.timer.isInTimer(eventId, begTime, duration, service) > ((duration/10)*8)) - sname = service_name r1=self.service_rect r2=self.progress_rect r3=self.descr_rect r4=self.start_end_rect res = [ None ] # no private data needed - 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; if rec: - res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, sname)) - res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r1.left()+r1.width()-16, r1.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, service_name)) + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r1.left()+r1.width()-16, r1.top(), 21, 21, self.clock_pixmap)) else: - res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, sname)) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, service_name)) if begTime is not None: if nowTime < begTime: begin = localtime(begTime) @@ -241,10 +197,8 @@ class EPGList(HTMLComponent, GUIComponent): def fillMultiEPG(self, services, stime=-1): t = time() - test = [ '0RIBDTCN' ] - for service in services: - tuple = (service.ref.toString(), 0, stime) - test.append( tuple ) + test = [ (service.ref.toString(), 0, stime) for service in services ] + test.insert(0, '0RIBDTCn') self.list = self.queryEPG(test) self.l.setList(self.list) print time() - t @@ -252,14 +206,8 @@ class EPGList(HTMLComponent, GUIComponent): def updateMultiEPG(self, direction): t = time() - test = [ 'RIBDTCN' ] - for x in self.list: - service = x[1] - begTime = x[3] - duration = x[4] - if begTime is None: - begTime = 0 - test.append((service, direction, begTime)) + test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ] + test.insert(0, 'RIBDTCn') tmp = self.queryEPG(test) cnt=0 for x in tmp: @@ -274,22 +222,37 @@ class EPGList(HTMLComponent, GUIComponent): 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.l.setList(self.queryEPG(test)) + test = [ 'RIBDT', (service.ref.toString(), 0, -1, -1) ] + self.list = self.queryEPG(test) + self.l.setList(self.list) print time() - t self.selectionChanged() - def sort_func(self,x,y): - if x[2] < y[2]: - return -1 - elif x[2] == y[2]: - return 0 - else: - return 1 + def sortSingleEPG(self, type): + if len(self.list): + if type == 1: + event_id = self.getSelectedEventId() + self.list.sort(key=lambda x: (x[4] and x[4].lower(), x[2])) + self.l.setList(self.list) + self.moveToEventId(event_id) + else: + assert(type == 0) + event_id = self.getSelectedEventId() + self.list.sort(key=lambda x: x[2]) + self.l.setList(self.list) + self.moveToEventId(event_id) + + def getSelectedEventId(self): + x = self.l.getCurrentSelection() + return x and x[1] + + def moveToEventId(self, eventId): + index = 0 + for x in self.list: + if x[1] == eventId: + self.instance.moveSelectionTo(index) + break + index += 1 def fillSimilarList(self, refstr, event_id): t = time() @@ -298,7 +261,7 @@ class EPGList(HTMLComponent, GUIComponent): return l = self.epgcache.search(('RIBND', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id)) if l and len(l): - l.sort(self.sort_func) + l.sort(key=lambda x: x[2]) self.l.setList(l) self.selectionChanged() print time() - t