Support turbo2.

[vuplus_dvbapp] / lib / python / Screens / MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 15f6b46..77633c2 100644 (file)
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -189,8 +189,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
                self["DescriptionBorder"].hide()
 
                if not fileExists(config.movielist.last_videodir.value):
-                       config.movielist.last_videodir.value = defaultMoviePath()
-                       config.movielist.last_videodir.save()
+                       self.getDefaultMoviePath()
                self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value)
 
                self["list"] = MovieList(None,
@@ -242,6 +241,19 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
                self.onLayoutFinish.append(self.saveListsize)
                self.inited = False
 
+       def getDefaultMoviePath(self):
+               path = defaultMoviePath()
+               config.movielist.last_videodir.value = path
+               config.movielist.last_videodir.save()
+               tmp = config.movielist.videodirs.value[:]
+               if path not in tmp:
+                       tmp.append(path)
+                       tmp.sort()
+                       config.movielist.videodirs.value = tmp
+                       config.movielist.videodirs.save()
+
+               return path
+
        def updateDescription(self):
                if config.movielist.description.value == MovieList.SHOW_DESCRIPTION:
                        self["DescriptionBorder"].show()
@@ -346,13 +358,12 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
 
        def reloadList(self, sel = None, home = False):
                if not fileExists(config.movielist.last_videodir.value):
-                       path = defaultMoviePath()
-                       config.movielist.last_videodir.value = path
-                       config.movielist.last_videodir.save()
+                       path = self.getDefaultMoviePath()
                        self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + path)
                        self["freeDiskSpace"].path = path
                if sel is None:
                        sel = self.getCurrent()
+
                self["list"].reload(self.current_ref, self.selected_tags)
                title = _("Recorded files...")
                if config.usage.setup_level.index >= 2: # expert+
@@ -398,7 +409,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
        def showTagsN(self, tagele):
                if not self.tags:
                        self.showTagWarning()
-               elif not tagele or tagele.value in self.selected_tags or not tagele.value in self.tags:
+               elif not tagele or (self.selected_tags and tagele.value in self.selected_tags) or not tagele.value in self.tags:
                        self.showTagsMenu(tagele)
                else:
                        self.selected_tags_ele = tagele