fix service/movie remove (hold cursor position when possible)

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

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 003302b314f44dd7b68ee435d3cbb06ac41e7a2a..7121772c69922e5c471cd3cffd1f6094a1b033e2 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -1,14 +1,13 @@
 from HTMLComponent import *
 from GUIComponent import *
+from Tools.FuzzyDate import FuzzyTime
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation
 
 from enigma import eServiceReference, eServiceCenter, \
        eServiceCenterPtr, iListableServicePtr, \
        iStaticServiceInformationPtr
 
-
-
 RT_HALIGN_LEFT = 0
 RT_HALIGN_RIGHT = 1
 RT_HALIGN_CENTER = 2
@@ -27,11 +26,10 @@ RT_WRAP = 32
 def MovieListEntry(serviceref, serviceHandler):
        res = [ serviceref ]
 
-       info = iStaticServiceInformationPtr()
-
-       if serviceHandler.info(serviceref, info):
+       info = serviceHandler.info(serviceref)
+       
+       if info is None:
                # ignore service which refuse to info
-               del info
                return
        
        len = info.getLength(serviceref)
@@ -41,8 +39,17 @@ def MovieListEntry(serviceref, serviceHandler):
                len = "?:??"
        
        res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref)))
-       res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "Toller Film"))
-       res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, "Aufgenommen: irgendwann"))
+       
+       description = info.getInfoString(serviceref, iServiceInformation.sDescription)
+       begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
+       
+       begin_string = ""
+       if begin > 0:
+               t = FuzzyTime(begin)
+               begin_string = t[0] + ", " + t[1]
+       
+       res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, description))
+       res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, begin_string))
        res.append((200, 50, 200, 20, 1, RT_HALIGN_RIGHT, len))
        
        return res
@@ -55,7 +62,13 @@ class MovieList(HTMLComponent, GUIComponent):
                self.l.setList(self.list)
                self.l.setFont(0, gFont("Arial", 30))
                self.l.setFont(1, gFont("Arial", 18))
-       
+
+       def moveToIndex(self, index):
+               self.instance.moveSelectionTo(index)
+
+       def getCurrentIndex(self):
+               return self.instance.getCurrentIndex()
+
        def getCurrent(self):
                return self.l.getCurrentSelection()
        
@@ -73,19 +86,18 @@ class MovieList(HTMLComponent, GUIComponent):
                # nice list
                
                self.list = [ ]
+               self.root = root
                
-               serviceHandler = eServiceCenterPtr()
-               eServiceCenter.getInstance(serviceHandler)
-               list = iListableServicePtr()
+               serviceHandler = eServiceCenter.getInstance()
+               list = serviceHandler.list(root)
                
-               if serviceHandler.list(root, list):
+               if list is None:
                        raise "listing of movies failed"
 
                movieList = [ ]
                while 1:
-                       s = eServiceReference()
-                       if list.getNext(s):
-                               del s
+                       s = list.getNext()
+                       if not s.valid():
                                del list
                                break
                        movieList.append(s)
@@ -93,3 +105,10 @@ class MovieList(HTMLComponent, GUIComponent):
                # now process them...
                for ref in movieList:
                        self.list.append(MovieListEntry(ref, serviceHandler))
+
+       def reload(self):
+               self.load(self.root)
+               self.l.setList(self.list)
+
+       def moveDown(self):
+               self.instance.moveSelection(self.instance.moveDown)