revert & fix typo
[enigma2.git] / lib / python / Components / EpgList.py
index 7e5dca10187f2bf3ddfd2586c4046d8b2fc3de4c..10e56ae0b9f925b66df2e39716f86fc104d499a8 100644 (file)
@@ -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:
@@ -54,6 +56,13 @@ class EPGList(HTMLComponent, GUIComponent):
                        self.l = eListboxEPGContent()
                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)
                self.epgcache = eEPGCache.getInstance()
 
        def getEventFromId(self, service, eventid):
@@ -65,19 +74,32 @@ class EPGList(HTMLComponent, GUIComponent):
        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])
+               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()[0]
+                       tmp = self.l.getCurrentSelection()
+                       if tmp is None:
+                               return ( None, None )
                        eventid = tmp[1]
-                       service = ServiceReference(tmp[2])
+                       service = ServiceReference(tmp[0])
                        event = self.getEventFromId(service, eventid)
                        evt = ( event, service )
                return evt
@@ -100,19 +122,18 @@ 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)
+       GUI_WIDGET = eListbox
+       
+       def postWidgetCreate(self, instance):
+               instance.setWrapAround(True)
+               instance.selectionChanged.get().append(self.selectionChanged)
+               instance.setContent(self.l)
                if SINGLE_CPP > 0:
-                       self.instance.setItemHeight(25)
-
-       def GUIdelete(self):
-               self.instance = None
+                       instance.setItemHeight(25)
 
        def recalcEntrySize(self):
                if SINGLE_CPP == 0:
@@ -122,10 +143,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:
+                               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)
@@ -136,27 +157,51 @@ class EPGList(HTMLComponent, GUIComponent):
                                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)) 
+               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 buildSingleEntry(self, eventId, beginTime, duration, EventName, rec=False):
-               r1=self.datetime_rect
-               r2=self.descr_rect
-               res = [ eventId ]
+       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, 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, 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.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, 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, 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):
@@ -165,7 +210,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)
@@ -188,17 +237,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()
@@ -207,21 +252,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
@@ -234,12 +277,26 @@ class EPGList(HTMLComponent, GUIComponent):
                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.timer.isInTimer(eventid=x[0], begin=x[1], duration=x[2], service=service) > 0)))
-#                              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()
+
+       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