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

diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py
index c217aa5c..5a26a7d4 100644
--- a/lib/python/Components/Scanner.py
+++ b/lib/python/Components/Scanner.py
@@ -16,6 +16,7 @@ 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
@@ -24,6 +25,8 @@ 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 == "ts":
@@ -129,13 +132,9 @@ 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()
+	from Components.Harddisk import harddiskmanager	
 	blockdev = mountpoint.split('/')[2]
-	error, blacklisted, removable, is_cdrom, partitions = cdaman.getBlockDevInfo(blockdev)
+	error, blacklisted, removable, is_cdrom, partitions = harddiskmanager.getBlockDevInfo(blockdev)
 
 	# now scan the paths
 	for p in paths_to_scan: