X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ab26adc86e6198e65e20d6bf707a6011208111ce..09f66522e9f51ac8fc7921bd77ba36a9d9d3d4b3:/lib/python/Components/Scanner.py

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index f7e307b7..86a5431d 100644
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -24,14 +24,20 @@ 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":
 			return "video/x-dvd-iso"
 		elif file[-12:].lower() == "video_ts.ifo":
 			return "video/x-dvd"
+		elif ext == "dat" and file[-11:-6].lower() == "avseq":
+			return "video/x-vcd"
 	return type
 
 class Scanner:
@@ -126,14 +132,10 @@ def scanDevice(mountpoint):
 
 	# convert to list
 	paths_to_scan = list(paths_to_scan)
-	
-	from Components.Harddisk import HarddiskManager	
-	class CdromManager(HarddiskManager):
-		def __init__(self):
-			pass
-	cdaman = CdromManager()
-	blockdev = mountpoint.split('/')[2]
-	error, blacklisted, removable, is_cdrom, partitions = cdaman.getBlockDevInfo(blockdev)
+
+	from Components.Harddisk import harddiskmanager	
+	blockdev = mountpoint.rstrip("/").rsplit('/',1)[-1]
+	error, blacklisted, removable, is_cdrom, partitions, medium_found = harddiskmanager.getBlockDevInfo(blockdev)
 
 	# now scan the paths
 	for p in paths_to_scan: