Merge branch 'acid-burn/bug_622_swupgrade_networkcheck' into experimental

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

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
old mode 100644 (file)
new mode 100755 (executable)
index 618c9c9..41cd1b2
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -1,12 +1,14 @@
 from HTMLComponent import HTMLComponent
 from GUIComponent import GUIComponent
 
 from HTMLComponent import HTMLComponent
 from GUIComponent import GUIComponent
 

-from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \
+from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, \

        RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER
 
        RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER
 

+from Tools.LoadPixmap import LoadPixmap
+

 from time import localtime, time
 from ServiceReference import ServiceReference
 from time import localtime, time
 from ServiceReference import ServiceReference

-from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
+from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN

 
 EPG_TYPE_SINGLE = 0
 EPG_TYPE_MULTI = 1
 
 EPG_TYPE_SINGLE = 0
 EPG_TYPE_MULTI = 1


@@ -33,7 +35,7 @@ class Rect:
 
 class EPGList(HTMLComponent, GUIComponent):
        def __init__(self, type=EPG_TYPE_SINGLE, selChangedCB=None, timer = None):
 
 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.days = (_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun"))

                self.timer = timer
                self.onSelChanged = [ ]
                if selChangedCB is not None:
                self.timer = timer
                self.onSelChanged = [ ]
                if selChangedCB is not None:


@@ -41,6 +43,8 @@ class EPGList(HTMLComponent, GUIComponent):
                GUIComponent.__init__(self)
                self.type=type
                self.l = eListboxPythonMultiContent()
                GUIComponent.__init__(self)
                self.type=type
                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:
                if type == EPG_TYPE_SINGLE:
                        self.l.setBuildFunc(self.buildSingleEntry)
                elif type == EPG_TYPE_MULTI:


@@ -49,7 +53,11 @@ class EPGList(HTMLComponent, GUIComponent):
                        assert(type == EPG_TYPE_SIMILAR)
                        self.l.setBuildFunc(self.buildSimilarEntry)
                self.epgcache = eEPGCache.getInstance()
                        assert(type == EPG_TYPE_SIMILAR)
                        self.l.setBuildFunc(self.buildSimilarEntry)
                self.epgcache = eEPGCache.getInstance()

-               self.clock_pixmap = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, 'epgclock-fs8.png'))
+               self.clock_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock.png'))
+               self.clock_add_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_add.png'))
+               self.clock_pre_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_pre.png'))
+               self.clock_post_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_post.png'))
+               self.clock_prepost_pixmap = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_prepost.png'))

 
        def getEventFromId(self, service, eventid):
                event = None
 
        def getEventFromId(self, service, eventid):
                event = None


@@ -58,7 +66,7 @@ class EPGList(HTMLComponent, GUIComponent):
                return event
 
        def getCurrentChangeCount(self):
                return event
 
        def getCurrentChangeCount(self):

-               if self.type == EPG_TYPE_MULTI:
+               if self.type == EPG_TYPE_MULTI and self.l.getCurrentSelection() is not None:

                        return self.l.getCurrentSelection()[0]
                return 0
 
                        return self.l.getCurrentSelection()[0]
                return 0
 


@@ -90,23 +98,26 @@ class EPGList(HTMLComponent, GUIComponent):
        def selectionChanged(self):
                for x in self.onSelChanged:
                        if x is not None:
        def selectionChanged(self):
                for x in self.onSelChanged:
                        if x is not None:

-                               try:
-                                       x()
-                               except: # FIXME!!!
-                                       print "FIXME in EPGList.selectionChanged"
-                                       pass
+                               x()
+#                              try:
+#                                      x()
+#                              except: # FIXME!!!
+#                                      print "FIXME in EPGList.selectionChanged"
+#                                      pass

 
        GUI_WIDGET = eListbox
 
        GUI_WIDGET = eListbox

-       
+

        def postWidgetCreate(self, instance):
                instance.setWrapAround(True)
                instance.selectionChanged.get().append(self.selectionChanged)
                instance.setContent(self.l)
 
        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):
                esize = self.l.getItemSize()
        def recalcEntrySize(self):
                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:
                width = esize.width()
                height = esize.height()
                if self.type == EPG_TYPE_SINGLE:


@@ -129,62 +140,108 @@ class EPGList(HTMLComponent, GUIComponent):
                        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)
 
                        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):
        def buildSingleEntry(self, service, eventId, beginTime, duration, EventName):

-               rec=(self.timer.isInTimer(eventId, beginTime, duration, service) > ((duration/10)*8)) 
+               (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration)

                r1=self.weekday_rect
                r2=self.datetime_rect
                r3=self.descr_rect
                r1=self.weekday_rect
                r2=self.datetime_rect
                r3=self.descr_rect

-               res = [ None ]  # no private data needed

                t = localtime(beginTime)
                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])))
+               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:
                if rec:

-                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, self.clock_pixmap))
-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.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, r3.left(), r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, EventName))
                return res
 
        def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration):
                else:
                        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)) 
+               (clock_pic, rec) = self.getPixmapForEntry(service, eventId, beginTime, duration)

                r1=self.weekday_rect
                r2=self.datetime_rect
                r3=self.service_rect
                r1=self.weekday_rect
                r2=self.datetime_rect
                r3=self.service_rect

-               res = [ None ]  # no private data needed

                t = localtime(beginTime)
                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])))
+               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:
                if rec:

-                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r3.left(), r3.top(), 21, 21, self.clock_pixmap))
-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r3.left() + 25, r3.top(), r3.width(), r3.height(), 0, RT_HALIGN_LEFT, service_name))
+                       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
 
                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))
+       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
                if rec:
                r1=self.service_rect
                r2=self.progress_rect
                r3=self.descr_rect
                r4=self.start_end_rect
                res = [ None ] # no private data needed
                if rec:

-                       res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width()-21, r1.height(), 0, RT_HALIGN_LEFT, service_name))
-                       res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, r1.left()+r1.width()-16, r1.top(), 21, 21, self.clock_pixmap))
+                       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, service_name))
                else:
                        res.append((eListboxPythonMultiContent.TYPE_TEXT, r1.left(), r1.top(), r1.width(), r1.height(), 0, RT_HALIGN_LEFT, service_name))

-               if begTime is not None:
-                       if nowTime < begTime:
-                               begin = localtime(begTime)
-                               end = localtime(begTime+duration)
+               if beginTime is not None:
+                       if nowTime < beginTime:
+                               begin = localtime(beginTime)
+                               end = localtime(beginTime+duration)

 #                              print "begin", begin
 #                              print "end", end
 #                              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:
                        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):
                return res
 
        def queryEPG(self, list, buildFunc=None):


@@ -196,18 +253,18 @@ class EPGList(HTMLComponent, GUIComponent):
                return [ ]
 
        def fillMultiEPG(self, services, stime=-1):
                return [ ]
 
        def fillMultiEPG(self, services, stime=-1):

-               t = time()
+               #t = time()

                test = [ (service.ref.toString(), 0, stime) for service in services ]
                test = [ (service.ref.toString(), 0, stime) for service in services ]

-               test.insert(0, '0RIBDTCn')
+               test.insert(0, 'X0RIBDTCn')

                self.list = self.queryEPG(test)
                self.l.setList(self.list)
                self.list = self.queryEPG(test)
                self.l.setList(self.list)

-               print time() - t
+               #print time() - t

                self.selectionChanged()
 
        def updateMultiEPG(self, direction):
                self.selectionChanged()
 
        def updateMultiEPG(self, direction):

-               t = time()
+               #t = time()

                test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ]
                test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ]

-               test.insert(0, 'RIBDTCn')
+               test.insert(0, 'XRIBDTCn')

                tmp = self.queryEPG(test)
                cnt=0
                for x in tmp:
                tmp = self.queryEPG(test)
                cnt=0
                for x in tmp:


@@ -217,23 +274,53 @@ 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)
                                        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):
                self.selectionChanged()
 
        def fillSingleEPG(self, service):

-               t = time()
+               #t = time()

                test = [ 'RIBDT', (service.ref.toString(), 0, -1, -1) ]
                test = [ 'RIBDT', (service.ref.toString(), 0, -1, -1) ]

-               self.l.setList(self.queryEPG(test))
-               print time() - t
+               self.list = self.queryEPG(test)
+               self.l.setList(self.list)
+               #print time() - t

                self.selectionChanged()
 
                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()
 
        def fillSimilarList(self, refstr, event_id):
                t = time()


@@ -242,7 +329,7 @@ class EPGList(HTMLComponent, GUIComponent):
                        return
                l = self.epgcache.search(('RIBND', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id))
                if l and len(l):
                        return
                l = self.epgcache.search(('RIBND', 1024, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, event_id))
                if l and len(l):

-                       l.sort(self.sort_func)
+                       l.sort(key=lambda x: x[2])

                self.l.setList(l)
                self.selectionChanged()
                print time() - t
                self.l.setList(l)
                self.selectionChanged()
                print time() - t