add StaticMultiList for MultiContentList-styled content

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

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index ce1f236f4246af6f019e27daaecec840769e7ecd..01358d532fc0b51222e69cd98bdd2af953ea4fb4 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -2,20 +2,14 @@ from HTMLComponent import *
 from GUIComponent import *
 import re
 
+from os import path as os_path, listdir
 from MenuList import MenuList
+from Components.Harddisk import harddiskmanager
 
-from Tools.Directories import *
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
-from enigma import *
-
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
+from enigma import RT_HALIGN_LEFT, loadPNG, eListbox, eListboxPythonMultiContent, \
+       eServiceReference, eServiceCenter, gFont
 
 EXTENSIONS = {
                "mp3": "music",
@@ -24,6 +18,7 @@ EXTENSIONS = {
                "jpg": "picture",
                "jpeg": "picture",
                "png": "picture",
+               "bmp": "picture",
                "ts": "movie",
                "avi": "movie",
                "mpg": "movie",
@@ -32,12 +27,12 @@ EXTENSIONS = {
 
 def FileEntryComponent(name, absolute = None, isDir = False):
        res = [ (absolute, isDir) ]
-       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT, name))
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 470, 20, 0, RT_HALIGN_LEFT, name))
        if isDir:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png"))
        else:
                extension = name.split('.')
-               extension = extension[-1]
+               extension = extension[-1].lower()
                if EXTENSIONS.has_key(extension):
                        png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png"))
                else:
@@ -52,6 +47,8 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
                
+               self.mount_point = None
+               self.current_directory = None
                self.useServiceRef = useServiceRef
                self.showDirectories = showDirectories
                self.showFiles = showFiles
@@ -61,20 +58,36 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                self.changeDir(directory)
 
                self.l.setFont(0, gFont("Regular", 18))
-               
+               self.l.setItemHeight(23)
+
        def getSelection(self):
+               if self.l.getCurrentSelection() is None:
+                       return None
                return self.l.getCurrentSelection()[0]
        
        def getFileList(self):
                return self.list
        
-       def changeDir(self, directory):
+       def changeDir(self, directory, select = None):
                self.list = []
                
+               # if we are just entering from the list of mount points:
+               if self.current_directory is None:
+                       self.mount_point = directory
+               self.current_directory = directory
                directories = []
                files = []
                
-               if self.useServiceRef:
+               if directory is None: # present available mountpoints
+                       print "listing partitions:"
+                       for p in harddiskmanager.getMountedPartitions():
+                               if p.mountpoint == "/":
+                                       self.list.append(FileEntryComponent(name = p.description, absolute = p.mountpoint, isDir = True))
+                               else:
+                                       self.list.append(FileEntryComponent(name = p.description, absolute = p.mountpoint + "/", isDir = True))
+                       files = [ ]
+                       directories = [ ]
+               elif self.useServiceRef:
                        root = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + directory)
                        serviceHandler = eServiceCenter.getInstance()
                        list = serviceHandler.list(root)
@@ -89,17 +102,22 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                else:
                                        files.append(s)
                                print s.getName(), s.flags
+                       directories.sort()
+                       files.sort()
                else:
-                       files = os.listdir(directory)
+                       files = listdir(directory)
                        files.sort()
                        tmpfiles = files[:]
                        for x in tmpfiles:
-                               if os.path.isdir(directory + x):
-                                       directories.append(x)
+                               if os_path.isdir(directory + x):
+                                       directories.append(directory + x + "/")
                                        files.remove(x)
                
-               if directory != "/" and self.showDirectories and not self.isTop:
-                       self.list.append(FileEntryComponent(name = "..", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
+               if directory is not None and self.showDirectories and not self.isTop:
+                       if directory == self.mount_point:
+                               self.list.append(FileEntryComponent(name = ".. (" +_("List of Storage Devices") + ")", absolute = None, isDir = True))
+                       else:
+                               self.list.append(FileEntryComponent(name = "..", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
 
                if self.showDirectories:
                        for x in directories:
@@ -120,23 +138,52 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
                                                self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
                                else:
                                        self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
-                               
+
                self.l.setList(self.list)
                
+               if select is not None:
+                       i = 0
+                       self.moveToIndex(0)
+                       for x in self.list:
+                               p = x[0][0]
+                               
+                               if isinstance(p, eServiceReference):
+                                       p = p.getPath()
+                               
+                               if p == select:
+                                       self.moveToIndex(i)
+                               i += 1
+
+       def getCurrentDirectory(self):
+               return self.current_directory
+
        def canDescent(self):
+               if self.getSelection() is None:
+                       return False
                return self.getSelection()[1]
        
        def descent(self):
-               self.changeDir(self.getSelection()[0])
+               if self.getSelection() is None:
+                       return
+               self.changeDir(self.getSelection()[0], select = self.current_directory)
                
        def getFilename(self):
-               return self.getSelection()[0].getPath()
+               if self.getSelection() is None:
+                       return None
+               x = self.getSelection()[0]
+               if isinstance(x, eServiceReference):
+                       x = x.getPath()
+               return x
 
        def getServiceRef(self):
-               return self.getSelection()[0]
+               if self.getSelection() is None:
+                       return None
+               x = self.getSelection()[0]
+               if isinstance(x, eServiceReference):
+                       return x
+               return None
 
        GUI_WIDGET = eListbox
 
        def postWidgetCreate(self, instance):
                instance.setContent(self.l)
-               instance.setItemHeight(23)