another fix

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

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index d0ca59ffc453be1f2717668759e63ea32eb06b6e..7e6ced57373a059bb55095d953f836d5eb0d48d8 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -33,12 +33,12 @@ def FileEntryComponent(name, absolute, isDir = False):
        res = [ (absolute, isDir) ]
        res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT ,name))
        if isDir:
-               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/directory.png"))
+               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/directory.png"))
        else:
                extension = name.split('.')
-               extension = extension[len(extension) - 1]
+               extension = extension[-1]
                if EXTENSIONS.has_key(extension):
-                       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/" + EXTENSIONS[extension] + ".png"))
+                       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "extensions/" + EXTENSIONS[extension] + ".png"))
        if png is not None:
                res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 10, 2, 20, 20, png))
        
@@ -63,15 +63,25 @@ class FileList(HTMLComponent, GUIComponent, MenuList):
        def changeDir(self, directory):
                self.list = []
                
-               directories = os.listdir(directory)
+               files = os.listdir(directory)
+               files.sort()
                
                if directory != "/" and self.showDirectories:
                        self.list.append(FileEntryComponent(name = "..", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
-               for x in directories:
+                       
+               directories = []
+               for x in files:
                        if os.path.isdir(directory + x):
-                               if self.showDirectories:
-                                       self.list.append(FileEntryComponent(name = x, absolute = directory + x + "/" , isDir = True))
-                       elif self.showFiles:
+                               directories.append(x)
+                               files.remove(x)
+
+               if self.showDirectories:
+                       for x in directories:
+                               self.list.append(FileEntryComponent(name = x, absolute = directory + x + "/" , isDir = True))
+
+                                       
+               if self.showFiles:
+                       for x in files:
                                if self.matchingPattern is not None:
                                        if re.compile(self.matchingPattern).search(x):
                                                self.list.append(FileEntryComponent(name = x, absolute = directory + x , isDir = False))
@@ -83,4 +93,4 @@ class FileList(HTMLComponent, GUIComponent, MenuList):
        def GUIcreate(self, parent):
                self.instance = eListbox(parent)
                self.instance.setContent(self.l)
-               self.instance.setItemHeight(23)
\ No newline at end of file
+               self.instance.setItemHeight(23)