X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/52492210cfa975235fb07171f0348e9471edd8ef..72e8548b23270b0605282d533debf7ef241fa923:/lib/python/Components/EpgList.py diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 1ea0a1cf..59f92621 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -1,8 +1,11 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent + +from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, \ + RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER + +from Tools.LoadPixmap import LoadPixmap -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 +14,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 @@ -45,24 +35,29 @@ 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: 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() + self.l.setFont(0, gFont("Regular", 22)) + self.l.setFont(1, gFont("Regular", 16)) + 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 = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock.png')) + self.clock_add_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_add.png')) + self.clock_pre_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_pre.png')) + self.clock_post_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_post.png')) + self.clock_prepost_pixmap = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, 'skin_default/icons/epgclock_prepost.png')) def getEventFromId(self, service, eventid): event = None @@ -71,37 +66,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 and self.l.getCurrentSelection() is not None: + 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) @@ -119,108 +98,150 @@ class EPGList(HTMLComponent, GUIComponent): def selectionChanged(self): for x in self.onSelChanged: if x is not None: - try: - x() - except: - 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 + x() +# try: +# x() +# except: # FIXME!!! +# print "FIXME in EPGList.selectionChanged" +# pass + + GUI_WIDGET = eListbox + + def postWidgetCreate(self, instance): + instance.setWrapAround(True) + instance.selectionChanged.get().append(self.selectionChanged) + instance.setContent(self.l) + + def preWidgetRemove(self, instance): + instance.selectionChanged.get().remove(self.selectionChanged) + instance.setContent(None) 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) - 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 - xpos = 0; - w = width/10*3; - self.datetime_rect = Rect(xpos, 0, w-10, height) - xpos += w - w = width/10*7; - self.service_rect = Rect(xpos, 0, w-10, height) - - def buildSingleEntry(self, eventId, beginTime, duration, EventName): - 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 + esize = self.l.getItemSize() + 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 getClockPixmap(self, refstr, beginTime, duration, eventId): + pre_clock = 1 + post_clock = 2 + clock_type = 0 + endTime = beginTime + duration + for x in self.timer.timer_list: + if x.service_ref.ref.toString() == refstr: + if x.eit == eventId: + return self.clock_pixmap + beg = x.begin + end = x.end + if beginTime > beg and beginTime < end and endTime > end: + clock_type |= pre_clock + elif beginTime < beg and endTime > beg and endTime < end: + clock_type |= post_clock + if clock_type == 0: + return self.clock_add_pixmap + elif clock_type == pre_clock: + return self.clock_pre_pixmap + elif clock_type == post_clock: + return self.clock_post_pixmap + else: + return self.clock_prepost_pixmap + + def getPixmapForEntry(self, service, eventId, beginTime, duration): + rec=beginTime and (self.timer.isInTimer(eventId, beginTime, duration, service)) + if rec: + clock_pic = self.getClockPixmap(service, beginTime, duration, eventId) + else: + clock_pic = None + return (clock_pic, rec) + + def buildSingleEntry(self, service, eventId, beginTime, duration, EventName): + (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration) + r1=self.weekday_rect + r2=self.datetime_rect + r3=self.descr_rect 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 = [ + None, # no private data needed + (eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, self.days[t[6]]), + (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, 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)) + res.extend(( + (eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, clock_pic), + (eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName) + )) else: - res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName)) + 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): - r1=self.datetime_rect - r2=self.service_rect - res = [ None ] # no private data needed + def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration): + (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration) + r1=self.weekday_rect + r2=self.datetime_rect + r3=self.service_rect 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, service_name)) + res = [ + None, # no private data needed + (eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_RIGHT, self.days[t[6]]), + (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.extend(( + (eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, clock_pic), + (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 + def buildMultiEntry(self, changecount, service, eventId, beginTime, duration, EventName, nowTime, service_name): + (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration) 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.extend(( + (eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, service_name), + (eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r1.left()+r1.width()-16, r1.top(), 21, 21, clock_pic) + )) 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) - end = localtime(begTime+duration) + res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, service_name)) + if beginTime is not None: + if nowTime < beginTime: + begin = localtime(beginTime) + end = localtime(beginTime+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)) + res.extend(( + (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])), + (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)) + percent = (nowTime - beginTime) * 100 / duration + res.extend(( + (eListboxPythonMultiContent.TYPE_PROGRESS, r2.left(), r2.top(), r2.width(), r2.height(), percent), + (eListboxPythonMultiContent.TYPE_TEXT, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName) + )) return res def queryEPG(self, list, buildFunc=None): @@ -231,27 +252,19 @@ class EPGList(HTMLComponent, GUIComponent): return self.epgcache.lookupEvent(list) return [ ] - def fillMultiEPG(self, services): - t = time() - test = [ '0RIBDTCN' ] - for service in services: - tuple = ( service.ref.toString(), 0 ) - test.append( tuple ) + def fillMultiEPG(self, services, stime=-1): + #t = time() + test = [ (service.ref.toString(), 0, stime) for service in services ] + test.insert(0, 'X0RIBDTCn') self.list = self.queryEPG(test) self.l.setList(self.list) - print time() - t + #print time() - t self.selectionChanged() 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)) + #t = time() + test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ] + test.insert(0, 'XRIBDTCn') tmp = self.queryEPG(test) cnt=0 for x in tmp: @@ -261,35 +274,62 @@ class EPGList(HTMLComponent, GUIComponent): 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 + #print time() - t self.selectionChanged() 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)) - print time() - t + #t = time() + 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): + list = self.list + if list: + event_id = self.getSelectedEventId() + if type == 1: + list.sort(key=lambda x: (x[4] and x[4].lower(), x[2])) + else: + assert(type == 0) + list.sort(key=lambda x: x[2]) + self.l.invalidate() + self.moveToEventId(event_id) + + def getSelectedEventId(self): + x = self.l.getCurrentSelection() + return x and x[1] + + def moveToService(self,serviceref): + if not serviceref: + return + index = 0 + refstr = serviceref.toString() + for x in self.list: + if x[1] == refstr: + self.instance.moveSelectionTo(index) + break + index += 1 + + def moveToEventId(self, eventId): + if not eventId: + return + 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() # search similar broadcastings if event_id is None: return - l = self.epgcache.search(('RIBN', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id)) - l.sort(self.sort_func) + l = self.epgcache.search(('RIBND', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id)) + if l and len(l): + l.sort(key=lambda x: x[2]) self.l.setList(l) self.selectionChanged() print time() - t