git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash when background jobs fail and user presses red key
[enigma2.git]
/
lib
/
python
/
Components
/
Scanner.py
diff --git
a/lib/python/Components/Scanner.py
b/lib/python/Components/Scanner.py
index 6bd0e3bddc4b970c21ff7f8912580522439a8897..766d19663d30db286f112c73f8615d6d30700dd2 100644
(file)
--- a/
lib/python/Components/Scanner.py
+++ b/
lib/python/Components/Scanner.py
@@
-24,12
+24,20
@@
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 == "dmpkg":
return "application/x-dream-package"
+ elif ext == "nfi":
+ return "application/x-dream-image"
+ elif ext == "ts":
+ return "video/MP2T"
elif ext == "iso":
elif ext == "iso":
- return "video/x-dvd-iso"
+ return "video/x-dvd-iso"
elif file[-12:].lower() == "video_ts.ifo":
return "video/x-dvd"
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:
@@
-125,13
+133,21
@@
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.rstrip("/").rsplit('/',1)[-1]
+ error, blacklisted, removable, is_cdrom, partitions = harddiskmanager.getBlockDevInfo(blockdev)
+
# now scan the paths
for p in paths_to_scan:
path = os_path.join(mountpoint, p.path)
for root, dirs, files in os_walk(path):
for f in files:
# now scan the paths
for p in paths_to_scan:
path = os_path.join(mountpoint, p.path)
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)