better detection of file extensions

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 31ffc98..d0ca59f 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -35,9 +35,10 @@ def FileEntryComponent(name, absolute, isDir = False):
        if isDir:
                png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/directory.png"))
        else:
-               # FIXME: detect file extensions correctly
-               if EXTENSIONS.has_key(name[-3:]):
-                       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/" + EXTENSIONS[name[-3:]] + ".png"))
+               extension = name.split('.')
+               extension = extension[len(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))
        

diff --git a/lib/python/Plugins/test/plugin.py b/lib/python/Plugins/test/plugin.py
index 18e8188..d054a82 100644 (file)
--- a/lib/python/Plugins/test/plugin.py
+++ b/lib/python/Plugins/test/plugin.py
@@ -22,7 +22,7 @@ class Test(Screen):
                self.skin = Test.skin
                Screen.__init__(self, session)
 
-               self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3)")
+               self["list"] = FileList("/", matchingPattern = "^.*\.(png|avi|mp3|mpeg)")
                self["pixmap"] = Pixmap()
                
                #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)