X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/df8830e6f19c5557fd52b1a9ac4fbf23c1afcdf2..bac49ddebb507c6a1b6f3b16218c9d6a97e70651:/lib/python/Components/EpgList.py diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index d2d9f1ce..861063a3 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -9,6 +9,7 @@ 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 @@ -44,6 +45,7 @@ class Rect: class EPGList(HTMLComponent, GUIComponent): 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: @@ -56,8 +58,11 @@ class EPGList(HTMLComponent, GUIComponent): self.l = eListboxPythonMultiContent() if type == EPG_TYPE_SINGLE: self.l.setBuildFunc(self.buildSingleEntry) - else: + elif type == EPG_TYPE_MULTI: self.l.setBuildFunc(self.buildMultiEntry) + else: + assert(type == EPG_TYPE_SIMILAR) + self.l.setBuildFunc(self.buildSimilarEntry) self.epgcache = eEPGCache.getInstance() def getEventFromId(self, service, eventid): @@ -76,14 +81,27 @@ class EPGList(HTMLComponent, GUIComponent): if SINGLE_CPP > 0: evt = self.l.getCurrent() else: - eventid = self.l.getCurrentSelection()[0] - evt = self.getEventFromId(self.service, eventid) - 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 def moveUp(self): @@ -126,10 +144,10 @@ class EPGList(HTMLComponent, GUIComponent): 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: + w = width/20*7 + self.datetime_rect = Rect(0, 0, w-15, height) + self.descr_rect = Rect(w, 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) @@ -140,14 +158,18 @@ class EPGList(HTMLComponent, GUIComponent): xpos += w w = width/10*5; self.descr_rect = Rect(xpos, 0, width, height) + else: # EPG_TYPE_SIMILAR + w = width/20*7; + self.datetime_rect = Rect(0, 0, w-15, height) + self.service_rect = Rect(w, 0, width/20*13, height) def buildSingleEntry(self, eventId, beginTime, duration, EventName): - rec=(self.timer.isInTimer(eventid=eventId, begin=beginTime, duration=duration, service=self.service) > 0) + rec=(self.timer.isInTimer(eventId, beginTime, duration, self.service) > ((duration/10)*8)) r1=self.datetime_rect r2=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_LEFT, "%02d.%02d, %02d:%02d"%(t[2],t[1],t[3],t[4]))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, "%s %02d.%02d, %02d:%02d"%(self.days[t[6]],t[2],t[1],t[3],t[4]))) if rec: res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r2.left(), r2.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left() + 25, r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName)) @@ -155,7 +177,22 @@ class EPGList(HTMLComponent, GUIComponent): res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.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.datetime_rect + r2=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_RIGHT, "%s %02d.%02d, %02d:%02d"%(self.days[t[6]],t[2],t[1],t[3],t[4]))) + if rec: + res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r2.left(), r2.top(), 21, 21, loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png')))) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left() + 25, r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, service_name)) + else: + res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.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 @@ -170,7 +207,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) @@ -236,3 +277,23 @@ class EPGList(HTMLComponent, GUIComponent): 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