add ability to filter by tag. they must be created by hand right now.
authorFelix Domke <tmbinc@elitedvb.net>
Sun, 29 Oct 2006 22:34:37 +0000 (22:34 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Sun, 29 Oct 2006 22:34:37 +0000 (22:34 +0000)
data/skin_default.xml
lib/python/Components/MovieList.py
lib/python/Screens/MovieSelection.py

index f2f1aba5cb7bb1777ca68e3b1b04de9916e57283..1ecb09982b3aa970d6d354266608419bf611720b 100644 (file)
        <screen name="PiPSetup" backgroundColor="transparent" position="70,400" size="600,150" title="PiPSetup" flags="wfNoBorder">
                <widget name="text" position="0,0" size="600,150" font="Regular;23" />
        </screen>
-       <screen name="MovieSelection" position="90,98" size="560,415" title="Select a movie">
-               <widget name="waitingtext" position="0,0" size="500,335" zPosition="2" font="Regular;22" />
-               <widget name="list" position="0,0" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
-               <widget name="freeDiskSpace" position="10,380" size="510,30" font="Regular;22" />
-               <ePixmap position="520,390" zPosition="1" size="36,20" pixmap="key_menu-fs8.png" transparent="1" alphatest="on" />
+       <screen name="MovieSelection" position="90,78" size="560,455" title="Select a movie">
+               <widget name="key_red" position="0,0" size="140,40" backgroundColor="red" font="Regular;21" />
+               <widget name="key_green" position="140,0" size="140,40" backgroundColor="green" font="Regular;21" />
+               <widget name="key_yellow" position="280,0" size="140,40" backgroundColor="yellow" font="Regular;21" />
+               <widget name="key_blue" position="420,0" size="140,40" backgroundColor="blue" font="Regular;21" />
+
+               <widget name="waitingtext" position="0,40" size="500,335" zPosition="2" font="Regular;22" />
+               <widget name="list" position="0,40" size="560,375" zPosition="1" scrollbarMode="showOnDemand" />
+               <widget name="freeDiskSpace" position="10,420" size="510,30" font="Regular;22" />
+               <ePixmap position="520,430" zPosition="1" size="36,20" pixmap="key_menu-fs8.png" transparent="1" alphatest="on" />
        </screen>
        <screen name="ServiceScan" position="200,100" size="300,330" title="Service Scan">
                <widget name="pass" position="10,10" size="280,30" font="Regular;20" />
index 1a61d20ff224039c0daeb3916f19d7c54ff94211..fca96e249c88380693bdc537cf5c9f268f50912c 100644 (file)
@@ -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))
@@ -73,11 +74,11 @@ class MovieList(HTMLComponent, GUIComponent):
                instance.setContent(self.l)
                instance.setItemHeight(75)
        
-       def reload(self, root = None):
+       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):
@@ -95,7 +96,7 @@ class MovieList(HTMLComponent, GUIComponent):
                        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
                
@@ -105,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"
 
@@ -118,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
index add42abf34af7460e2ff7091a0168d61fa96bf31..a2763c3ab8de3066ca5b4e1f0458de5011615138 100644 (file)
@@ -70,6 +70,11 @@ class MovieSelection(Screen):
        def __init__(self, session, selectedmovie = None):
                Screen.__init__(self, session)
                
+               self.tags = [ ]
+               self.selected_tags = None
+               
+               self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD))
+               
                self.movemode = False
                self.bouquet_mark_edit = False
                
@@ -82,15 +87,25 @@ class MovieSelection(Screen):
                self.list = self["list"]
                self.selectedmovie = selectedmovie
                
+               self["key_red"] = Button(_("All..."))
+               self["key_green"] = Button("")
+               self["key_yellow"] = Button("")
+               self["key_blue"] = Button("")
+               
                #self["okbutton"] = Button("ok", [self.channelSelected])
                self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
                
-               self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions"],
+               self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions", "ColorActions"],
                        {
                                "cancel": self.abort,
                                "ok": self.movieSelected,
                                "showEventInfo": self.showEventInformation,
                                "contextMenu": self.doContext,
+                               
+                               "red": self.showAll,
+                               "yellow": self.showTagsFirst,
+                               "green": self.showTagsSecond,
+                               "blue": self.showTagsMenu,
                        })
                self["actions"].csel = self
                self.onShown.append(self.go)
@@ -114,17 +129,15 @@ class MovieSelection(Screen):
                        self.inited=True
 
        def updateHDDData(self):
-               self["list"].reload(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)))
-               if (self.selectedmovie is not None):
+               self.reloadList()
+               if self.selectedmovie is not None:
                        self.moveTo()
                self["waitingtext"].instance.hide()
-                                               
+
                self["freeDiskSpace"].update()
-               
-               self.lengthTimer.start(10, 1)
-               self.lengthPosition = 0
-               self.lengthLength = len(self["list"])
-               
+
+               self.updateTags()
+
        def updateLengthData(self):
                self.list.updateLengthOfIndex(self.lengthPosition)
                self.lengthPosition += 1
@@ -150,3 +163,61 @@ class MovieSelection(Screen):
 
        def abort(self):
                self.close(None)
+
+       def updateTags(self):
+               # get a list of tags available in this list
+               self.tags = list(self["list"].tags)
+               
+               # by default, we do not display any filtering options
+               self.tag_first = ""
+               self.tag_second = ""
+               
+               # when tags are present, however, the first two are 
+               # directly mapped to the second, third ("green", "yellow") buttons
+               if len(self.tags) > 0:
+                       self.tag_first = self.tags[0]
+               
+               if len(self.tags) > 1:
+                       self.tag_second = self.tags[1]
+               
+               self["key_green"].text = self.tag_first
+               self["key_yellow"].text = self.tag_second
+               
+               # the rest is presented in a list, available on the
+               # fourth ("blue") button
+               if len(self.tags) > 2:
+                       self["key_blue"].text = _("Other...")
+               else:
+                       self["key_blue"].text = ""
+
+       def reloadList(self):
+               self["list"].reload(self.current_ref, self.selected_tags)
+               self.lengthTimer.start(10, 1)
+               self.lengthPosition = 0
+               self.lengthLength = len(self["list"])
+
+       def showAll(self):
+               self.selected_tags = None
+               self.reloadList()
+
+       def showTagsN(self, n):
+               if len(self.tags) < n:
+                       self.showTagWarning()
+               else:
+                       self.selected_tags = set([self.tags[n - 1]])
+                       self.reloadList()
+
+       def showTagsFirst(self):
+               self.showTagsN(1)
+
+       def showTagsSecond(self):
+               self.showTagsN(2)
+
+       def showTagsMenu(self):
+               if len(self.tags) < 3:
+                       self.showTagWarning()
+               else:
+                       pass
+
+       def showTagWarning(self):
+               print "select some tags first!"