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
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.timer = timer
self.onSelChanged = [ ]
if selChangedCB is not None:
self.onSelChanged.append(selChangedCB)
self.l = eListboxEPGContent()
else:
self.l = eListboxPythonMultiContent()
+ if type == EPG_TYPE_SINGLE:
+ self.l.setBuildFunc(self.buildSingleEntry)
+ else:
+ self.l.setBuildFunc(self.buildMultiEntry)
self.epgcache = eEPGCache.getInstance()
def getEventFromId(self, service, eventid):
def getCurrentChangeCount(self):
if self.type == EPG_TYPE_SINGLE:
return 0
- return self.l.getCurrentSelection()[0][0]
+ return self.l.getCurrentSelection()[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)
+ cur = self.l.getCurrentSelection()
+ if cur is None:
+ return cur
+ else:
+ evt = self.getEventFromId(self.service, cur[0])
else:
- tmp = self.l.getCurrentSelection()[0]
- eventid = tmp[1]
- service = ServiceReference(tmp[2])
+ 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 )
return evt
self.descr_rect = Rect(xpos, 0, width, 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 = [ eventId ]
+ 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))
+ 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))
+ else:
+ res.append((eListboxPythonMultiContent.TYPE_TEXT, r2.left(), r2.top(), r2.width(), r2.height(), 0, RT_HALIGN_LEFT, EventName))
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):
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)
def fillMultiEPG(self, services):
t = time()
- test = [ 'RIBDTCN' ]
+ test = [ '0RIBDTCN' ]
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(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()
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
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)
+ self.l.setList(self.queryEPG(test))
print time() - t
self.selectionChanged()
git.cweiske.de / enigma2.git / blobdiff