X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/705f75eb25eb4436f1b99a584dd47292d68cd6b2..56ac7a4a764a4251a851778df09967405aa9a930:/lib/python/Components/Scanner.py

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index e13370b5..766d1966 100644
--- 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