add ability to filter by tag. they must be created by hand right now.

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

diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index a47741c431787c3d8a22b537e6ac72104545f3bd..fca96e249c88380693bdc537cf5c9f268f50912c 100644 (file)
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -14,6 +14,7 @@ class MovieList(HTMLComponent, GUIComponent):
        def __init__(self, root):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
+               self.tags = set()
                if root is not None:
                        self.reload(root)
                self.l.setFont(0, gFont("Regular", 22))
@@ -59,23 +60,25 @@ class MovieList(HTMLComponent, GUIComponent):
        def getCurrentIndex(self):
                return self.instance.getCurrentIndex()
 
+       def getCurrentEvent(self):
+               l = self.l.getCurrentSelection()
+               return l and l[0] and l[1] and l[1].getEvent(l[0])
+
        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)
-               self.instance.setContent(self.l)
-               self.instance.setItemHeight(75)
+       GUI_WIDGET = eListbox
        
-       def GUIdelete(self):
-               self.instance.setContent(None)
-               self.instance = None
-
-       def reload(self, root = None):
+       def postWidgetCreate(self, instance):
+               instance.setContent(self.l)
+               instance.setItemHeight(75)
+       
+       def reload(self, root = None, filter_tags = None):
                if root is not None:
-                       self.load(root)
+                       self.load(root, filter_tags)
                else:
-                       self.load(self.root)
+                       self.load(self.root, filter_tags)
                self.l.setList(self.list)
 
        def removeService(self, service):
@@ -88,11 +91,12 @@ class MovieList(HTMLComponent, GUIComponent):
                return len(self.list)
 
        def updateLengthOfIndex(self, index):
-               x = self.list[index]
-               self.list[index] = (x[0], x[1], x[2], x[1].getLength(x[0]))
-               self.l.invalidateEntry(index)
+               if len(self.list) > index:
+                       x = self.list[index]
+                       self.list[index] = (x[0], x[1], x[2], x[1].getLength(x[0]))
+                       self.l.invalidateEntry(index)
 
-       def load(self, root):
+       def load(self, root, filter_tags):
                # this lists our root service, then building a 
                # nice list
                
@@ -102,6 +106,8 @@ class MovieList(HTMLComponent, GUIComponent):
                self.serviceHandler = eServiceCenter.getInstance()
                list = self.serviceHandler.list(root)
                
+               tags = set()
+               
                if list is None:
                        raise "listing of movies failed"
 
@@ -115,9 +121,28 @@ class MovieList(HTMLComponent, GUIComponent):
                        if info is None:
                                continue
                        begin = info.getInfo(serviceref, iServiceInformation.sTimeCreate)
+                       
+                       # convert space-seperated list of tags into a set
+                       this_tags = info.getInfoString(serviceref, iServiceInformation.sTags).split(' ')
+                       if this_tags == ['']:
+                               this_tags = []
+                       this_tags = set(this_tags)
+                       
+                       # filter_tags is either None (which means no filter at all), or 
+                       # a set. In this case, all elements of filter_tags must be present,
+                       # otherwise the entry will be dropped.                  
+                       if filter_tags is not None and not this_tags.issuperset(filter_tags):
+                               continue
+                       
+                       tags |= this_tags
                        self.list.append((serviceref, info, begin, -1))
                
+               # sort: key is 'begin'
                self.list.sort(key=lambda x: -x[2])
+               
+               # finally, store a list of all tags which were found. these can be presented
+               # to the user to filter the list
+               self.tags = tags
 
        def moveTo(self, serviceref):
                found = 0