add .cvsignores to plugins

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

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index a6b5bf2f520d4f4acbedf0e61f3c2157ee409976..961eb09ddc28d2c8ab96645d0a5021378bd6f6cb 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -1,5 +1,6 @@
 from HTMLComponent import *
 from GUIComponent import *
+import re
 
 from MenuList import MenuList
 
@@ -16,26 +17,42 @@ RT_VALIGN_TOP = 0
 RT_VALIGN_CENTER = 8
 RT_VALIGN_BOTTOM = 16
 
+EXTENSIONS = {
+               "mp3": "music",
+               "wav": "music",
+               "jpg": "picture",
+               "jpeg": "picture",
+               "png": "picture",
+               "ts": "movie",
+               "avi": "movie",
+               "mpg": "movie",
+               "mpeg": "movie",
+       }
+
 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"))
        else:
-               # FIXME: detect file extensions correctly
-               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/" + name[-3:] + ".png"))
+               extension = name.split('.')
+               extension = extension[-1]
+               if EXTENSIONS.has_key(extension):
+                       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))
        
        return res
 
 class FileList(HTMLComponent, GUIComponent, MenuList):
-       def __init__(self, directory, showDirectories = True, showFiles = True):
+       def __init__(self, directory, showDirectories = True, showFiles = True, matchingPattern = None):
                GUIComponent.__init__(self)
                self.l = eListboxPythonMultiContent()
 
                self.showDirectories = showDirectories
                self.showFiles = showFiles
+               # example: matching .nfi and .ts files: "^.*\.(nfi|ts)"
+               self.matchingPattern = matchingPattern
                self.changeDir(directory)
 
                self.l.setFont(0, gFont("Regular", 18))
@@ -46,16 +63,31 @@ 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))
+                               else:
                                        self.list.append(FileEntryComponent(name = x, absolute = directory + x , isDir = False))
+                               
                self.l.setList(self.list)
                                
        def GUIcreate(self, parent):