X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c69bb079fef352b7b34eac8739b0dc051629cb7b..b3135c06dd527e0ed65b6ffa921f830132f7d8b9:/lib/python/Components/Scanner.py

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index 5a26a7d4..766d1966 100644
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -16,7 +16,6 @@ def getExtension(file):
 
 def getType(file):
 	(type, _) = guess_type(file)
-	print "guessed type:", type
 	if type is None:
 		# Detect some mimetypes unknown to dm7025
 		# TODO: do mimetypes.add_type once should be better
@@ -29,6 +28,8 @@ def getType(file):
 			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":
@@ -131,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