fix inverted setting (meaning was inverted too)

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

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 0f3a3fd241114f2be78dceea69f153a261de4e0b..25c32b663c4c5e4b7360f76659865aad358ea4af 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -25,8 +25,6 @@ RT_WRAP = 32
 # | name of movie              |
 #
 def MovieListEntry(serviceref, serviceHandler):
-       res = [ serviceref ]
-
        info = serviceHandler.info(serviceref)
        
        if info is None:
@@ -39,19 +37,21 @@ def MovieListEntry(serviceref, serviceHandler):
        else:
                len = "?:??"
        
-       res.append((0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
-       
-       description = info.getInfoString(serviceref, iServiceInformation.sDescription)
        begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
+       res = [ (serviceref, begin) ]
+
+       res.append((0, 0, 0, 560, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
        
+       description = info.getInfoString(serviceref, iServiceInformation.sDescription)
+
        begin_string = ""
        if begin > 0:
                t = FuzzyTime(begin)
                begin_string = t[0] + ", " + t[1]
        
-       res.append((0, 30, 560, 20, 1, RT_HALIGN_LEFT, description))
-       res.append((0, 50, 270, 20, 1, RT_HALIGN_LEFT, begin_string))
-       res.append((290, 50, 270, 20, 1, RT_HALIGN_RIGHT, len))
+       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))
        
        return res
 
@@ -59,11 +59,11 @@ class MovieList(HTMLComponent, GUIComponent):
        def __init__(self, root):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
-               self.load(root)
-               self.l.setList(self.list)
+               if root is not None:
+                       self.reload(root)
                self.l.setFont(0, gFont("Regular", 30))
                self.l.setFont(1, gFont("Regular", 18))
-
+               
        def moveToIndex(self, index):
                self.instance.moveSelectionTo(index)
 
@@ -71,7 +71,7 @@ class MovieList(HTMLComponent, GUIComponent):
                return self.instance.getCurrentIndex()
 
        def getCurrent(self):
-               return self.l.getCurrentSelection()
+               return self.l.getCurrentSelection()[0]
        
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)
@@ -82,6 +82,13 @@ class MovieList(HTMLComponent, GUIComponent):
                self.instance.setContent(None)
                self.instance = None
 
+       def reload(self, root = None):
+               if root is not None:
+                       self.load(root)
+               else:
+                       self.load(self.root)
+               self.l.setList(self.list)
+
        def load(self, root):
                # this lists our root service, then building a 
                # nice list
@@ -106,19 +113,17 @@ class MovieList(HTMLComponent, GUIComponent):
                # now process them...
                for ref in movieList:
                        self.list.append(MovieListEntry(ref, serviceHandler))
-                       
+               
+               self.list.sort(key=lambda x: -x[0][1])
+
        def moveTo(self, serviceref):
                found = 0
                count = 0
                for x in self.list:
-                       if str(ServiceReference(x[0])) == str(ServiceReference(serviceref)):
+                       if str(ServiceReference(x[0][0])) == str(ServiceReference(serviceref)):
                                found = count
                        count += 1
                self.instance.moveSelectionTo(found)
 
-       def reload(self):
-               self.load(self.root)
-               self.l.setList(self.list)
-
        def moveDown(self):
                self.instance.moveSelection(self.instance.moveDown)