git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary debug and fix typo bug
[enigma2.git]
/
lib
/
python
/
Components
/
Scanner.py
diff --git
a/lib/python/Components/Scanner.py
b/lib/python/Components/Scanner.py
index 69237bc073bd58167f7d4f0de082b534d8074c6a..93c3c9ac74ee566d489b417efff720130f352172 100644
(file)
--- a/
lib/python/Components/Scanner.py
+++ b/
lib/python/Components/Scanner.py
@@
-24,6
+24,8
@@
def getType(file):
return "application/x-debian-package"
elif ext == "ogg":
return "application/ogg"
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":
elif ext == "dmpkg":
return "application/x-dream-package"
elif ext == "ts":
@@
-32,6
+34,8
@@
def getType(file):
return "video/x-dvd-iso"
elif file[-12:].lower() == "video_ts.ifo":
return "video/x-dvd"
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:
return type
class Scanner:
@@
-126,6
+130,10
@@
def scanDevice(mountpoint):
# convert to list
paths_to_scan = list(paths_to_scan)
# convert to list
paths_to_scan = list(paths_to_scan)
+
+ from Components.Harddisk import harddiskmanager
+ blockdev = mountpoint.split('/')[2]
+ error, blacklisted, removable, is_cdrom, partitions = harddiskmanager.getBlockDevInfo(blockdev)
# now scan the paths
for p in paths_to_scan:
# now scan the paths
for p in paths_to_scan:
@@
-133,7
+141,11
@@
def scanDevice(mountpoint):
for root, dirs, files in os_walk(path):
for f in files:
for root, dirs, files in os_walk(path):
for f in files:
- sfile = ScanFile(os_path.join(root, f))
+ path = os_path.join(root, f)
+ if is_cdrom and path.endswith(".wav") and path[-13:-6] == ("/track-"):
+ sfile = ScanFile(path,"audio/x-cda")
+ else:
+ sfile = ScanFile(path)
for s in scanner:
s.handleFile(res, sfile)
for s in scanner:
s.handleFile(res, sfile)