show service name in movielist

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

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 25c32b663c4c5e4b7360f76659865aad358ea4af..a921b8df088daacc16d7837b4b521fbcc6a50b0e 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -2,6 +2,7 @@ from HTMLComponent import *
 from GUIComponent import *
 from Tools.FuzzyDate import FuzzyTime
 from ServiceReference import ServiceReference
+from Components.MultiContent import MultiContentEntryText, RT_HALIGN_LEFT, RT_HALIGN_RIGHT
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
 
@@ -9,30 +10,21 @@ from enigma import eServiceReference, eServiceCenter, \
        eServiceCenterPtr, iListableServicePtr, \
        iStaticServiceInformationPtr
 
-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
-
-
 #
 # | name of movie              |
 #
 def MovieListEntry(serviceref, serviceHandler):
+       if serviceref.flags & eServiceReference.mustDescent:
+               return None
+
        info = serviceHandler.info(serviceref)
        
        if info is None:
                # ignore service which refuse to info
-               return
+               return None
        
        len = info.getLength(serviceref)
-       if len:
+       if len > 0:
                len = "%d:%02d" % (len / 60, len % 60)
        else:
                len = "?:??"
@@ -40,7 +32,10 @@ def MovieListEntry(serviceref, serviceHandler):
        begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
        res = [ (serviceref, begin) ]
 
-       res.append((0, 0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
+       res.append(MultiContentEntryText(pos=(0, 0), size=(420, 30), font = 0, flags = RT_HALIGN_LEFT, text = info.getName(serviceref)))
+       service = ServiceReference(info.getInfoString(serviceref, iServiceInformation.sServiceref))
+       if service is not None:
+               res.append(MultiContentEntryText(pos=(420, 0), size=(140, 30), font = 0, flags = RT_HALIGN_RIGHT, text = service.getServiceName()))
        
        description = info.getInfoString(serviceref, iServiceInformation.sDescription)
 
@@ -49,9 +44,9 @@ def MovieListEntry(serviceref, serviceHandler):
                t = FuzzyTime(begin)
                begin_string = t[0] + ", " + t[1]
        
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
+       res.append(MultiContentEntryText(pos=(0, 30), size=(560, 20), font=1, flags=RT_HALIGN_LEFT, text=description))
+       res.append(MultiContentEntryText(pos=(0, 50), size=(270, 20), font=1, flags=RT_HALIGN_LEFT, text=begin_string))
+       res.append(MultiContentEntryText(pos=(290, 50), size=(270, 20), font=1, flags=RT_HALIGN_RIGHT, text=len))
        
        return res
 
@@ -61,7 +56,7 @@ class MovieList(HTMLComponent, GUIComponent):
                self.l = eListboxPythonMultiContent()
                if root is not None:
                        self.reload(root)
-               self.l.setFont(0, gFont("Regular", 30))
+               self.l.setFont(0, gFont("Regular", 22))
                self.l.setFont(1, gFont("Regular", 18))
                
        def moveToIndex(self, index):
@@ -71,7 +66,8 @@ class MovieList(HTMLComponent, GUIComponent):
                return self.instance.getCurrentIndex()
 
        def getCurrent(self):
-               return self.l.getCurrentSelection()[0]
+               l = self.l.getCurrentSelection()
+               return l and l[0]
        
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)
@@ -89,6 +85,12 @@ class MovieList(HTMLComponent, GUIComponent):
                        self.load(self.root)
                self.l.setList(self.list)
 
+       def removeService(self, service):
+               for l in self.list[:]:
+                       if l[0][0] == service:
+                               self.list.remove(l)
+               self.l.setList(self.list)
+
        def load(self, root):
                # this lists our root service, then building a 
                # nice list
@@ -112,7 +114,9 @@ class MovieList(HTMLComponent, GUIComponent):
                
                # now process them...
                for ref in movieList:
-                       self.list.append(MovieListEntry(ref, serviceHandler))
+                       a = MovieListEntry(ref, serviceHandler)
+                       if a is not None:
+                               self.list.append(a)
                
                self.list.sort(key=lambda x: -x[0][1])