diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-02-22 00:15:09 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-02-22 00:15:09 +0000 |
| commit | e91e864a3a432663706356c342d4d382a5bc0d3b (patch) | |
| tree | a2227811607fbd65ae046a2e6832d20042d43b81 /lib/python | |
| parent | 105064cb459d5027ab5cfacb20f31ab04569ace2 (diff) | |
| download | enigma2-e91e864a3a432663706356c342d4d382a5bc0d3b.tar.gz enigma2-e91e864a3a432663706356c342d4d382a5bc0d3b.zip | |
better detection of file extensions
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/FileList.py | 7 | ||||
| -rw-r--r-- | lib/python/Plugins/test/plugin.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 31ffc98a..d0ca59ff 100644 --- 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 18e81885..d054a821 100644 --- 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) |