revert & fix typo

[enigma2.git] / lib / python / Components / EpgList.py

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index a1030b9a813ffc9009797ace53e7cc78b7a4ba17..10e56ae0b9f925b66df2e39716f86fc104d499a8 100644 (file)
--- 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):
@@ -81,7 +86,7 @@ class EPGList(HTMLComponent, GUIComponent):
                                        return cur
                                else:
                                        evt = self.getEventFromId(self.service, cur[0])
-               else:
+               elif self.type == EPG_TYPE_MULTI:
                        tmp = self.l.getCurrentSelection()
                        if tmp is None:
                                return ( None, None )
@@ -89,6 +94,14 @@ class EPGList(HTMLComponent, GUIComponent):
                        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):
@@ -109,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:
@@ -131,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)
@@ -145,19 +157,41 @@ 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.datetime_rect
-               r2=self.descr_rect
+               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_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, 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, 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_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):
@@ -203,11 +237,11 @@ class EPGList(HTMLComponent, GUIComponent):
                                return self.epgcache.lookupEvent(list)
                return [ ]
 
-       def fillMultiEPG(self, services):
+       def fillMultiEPG(self, services, stime=-1):
                t = time()
                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.l.setList(self.list)
@@ -246,3 +280,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