X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f097c3b368c10b7c88f63038459c4c5a38889a1f..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/python/Components/EpgList.py?ds=inline diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 542f5d9a..902968d4 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from HTMLComponent import * from GUIComponent import * @@ -5,9 +6,11 @@ from enigma import * from re import * from time import localtime, time from ServiceReference import ServiceReference +from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE EPG_TYPE_SINGLE = 0 EPG_TYPE_MULTI = 1 +EPG_TYPE_SIMILAR = 2 RT_HALIGN_LEFT = 0 RT_HALIGN_RIGHT = 1 @@ -20,8 +23,6 @@ RT_VALIGN_BOTTOM = 16 RT_WRAP = 32 -SINGLE_CPP = 0 - class Rect: def __init__(self, x, y, width, height): self.__left = x @@ -42,16 +43,22 @@ class Rect: return self.__width class EPGList(HTMLComponent, GUIComponent): - def __init__(self, type=EPG_TYPE_SINGLE, selChangedCB=None): + def __init__(self, type=EPG_TYPE_SINGLE, selChangedCB=None, timer = None): + self.days = [ _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun") ] + self.timer = timer self.onSelChanged = [ ] if selChangedCB is not None: 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() + assert(type == EPG_TYPE_SIMILAR) + self.l.setBuildFunc(self.buildSimilarEntry) self.epgcache = eEPGCache.getInstance() def getEventFromId(self, service, eventid): @@ -61,24 +68,21 @@ class EPGList(HTMLComponent, GUIComponent): return event def getCurrentChangeCount(self): - if self.type == EPG_TYPE_SINGLE: - return 0 - return self.l.getCurrentSelection()[0][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: - eventid = self.l.getCurrentSelection()[0] - evt = self.getEventFromId(self.service, eventid) - else: - tmp = self.l.getCurrentSelection()[0] - eventid = tmp[1] - service = ServiceReference(tmp[2]) - 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) @@ -98,59 +102,83 @@ class EPGList(HTMLComponent, GUIComponent): if x is not None: try: x() - except: + except: # FIXME!!! + print "FIXME in EPGList.selectionChanged" pass - def GUIcreate(self, parent): - self.instance = eListbox(parent) - self.instance.setWrapAround(True) - self.instance.selectionChanged.get().append(self.selectionChanged) - self.instance.setContent(self.l) - if SINGLE_CPP > 0: - self.instance.setItemHeight(25) - - def GUIdelete(self): - self.instance = None + GUI_WIDGET = eListbox + + 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: - 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) - - def buildSingleEntry(self, eventId, beginTime, duration, EventName): - r1=self.datetime_rect - r2=self.descr_rect - res = [ eventId ] + 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, 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 + res = [ None ] # no private data needed + t = localtime(beginTime) + 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_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)) + return res + + def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration): + rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) + r1=self.weekday_rect + r2=self.datetime_rect + r3=self.service_rect + res = [ None ] # no private data needed 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)) + 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_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)) return res 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 = [ (changecount, eventId, service, begTime, duration) ] + res = [ None ] # no private data needed re = compile('\xc2\x86.*?\xc2\x87') list = re.findall(sname) if len(list): @@ -159,7 +187,11 @@ class EPGList(HTMLComponent, GUIComponent): 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 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')))) + else: + 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) @@ -182,17 +214,13 @@ class EPGList(HTMLComponent, GUIComponent): return self.epgcache.lookupEvent(list) return [ ] - def fillMultiEPG(self, services): + def fillMultiEPG(self, services, stime=-1): t = time() - test = [ 'RIBDTCN' ] + test = [ '0RIBDTCN' ] for service in services: - tuple = ( service.ref.toString(), 0 ) + tuple = (service.ref.toString(), 0, stime) 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(0, x[0], x[1], x[2], x[3], x[4], x[5], x[6])) + self.list = self.queryEPG(test) self.l.setList(self.list) print time() - t self.selectionChanged() @@ -201,21 +229,19 @@ class EPGList(HTMLComponent, GUIComponent): t = time() test = [ 'RIBDTCN' ] for x in self.list: - data = x[0] - service = data[2] - begTime = data[3] - duration = data[4] + service = x[1] + begTime = x[3] + duration = x[4] if begTime is None: begTime = 0 test.append((service, direction, begTime)) -# self.list = self.queryEPG(test, self.buildMultiEntry) tmp = self.queryEPG(test) cnt=0 for x in tmp: - changecount = self.list[cnt][0][0] + direction + changecount = self.list[cnt][0] + direction if changecount >= 0: if x[2] is not None: - self.list[cnt]=self.buildMultiEntry(changecount, x[0], x[1], x[2], x[3], x[4], x[5], x[6]) + self.list[cnt]=(changecount, x[0], x[1], x[2], x[3], x[4], x[5], x[6]) cnt+=1 self.l.setList(self.list) print time() - t @@ -223,17 +249,27 @@ 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.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) + test = [ 'RIBDT', (service.ref.toString(), 0, -1, -1) ] + self.l.setList(self.queryEPG(test)) 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 fillSimilarList(self, refstr, event_id): + t = time() + # search similar broadcastings + if event_id is None: + return + l = self.epgcache.search(('RIBND', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id)) + if l and len(l): + l.sort(self.sort_func) + self.l.setList(l) + self.selectionChanged() + print time() - t