Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

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

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index e13370b592d2e24a535e5f5b2e45a5bac6740d93..766d19663d30db286f112c73f8615d6d30700dd2 100644 (file)
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -24,8 +24,12 @@ def getType(file):
                        return "application/x-debian-package"
                elif ext == "ogg":
                        return "application/ogg"
+               elif ext == "flac":
+                       return "audio/x-flac"
                elif ext == "dmpkg":
                        return "application/x-dream-package"
+               elif ext == "nfi":
+                       return "application/x-dream-image"
                elif ext == "ts":
                        return "video/MP2T"
                elif ext == "iso":
@@ -128,9 +132,9 @@ def scanDevice(mountpoint):
 
        # convert to list
        paths_to_scan = list(paths_to_scan)
-       
+
        from Components.Harddisk import harddiskmanager 
-       blockdev = mountpoint.split('/')[2]
+       blockdev = mountpoint.rstrip("/").rsplit('/',1)[-1]
        error, blacklisted, removable, is_cdrom, partitions = harddiskmanager.getBlockDevInfo(blockdev)
 
        # now scan the paths