git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hotplug: also close thread on language change
[enigma2.git]
/
lib
/
python
/
Components
/
FileList.py
diff --git
a/lib/python/Components/FileList.py
b/lib/python/Components/FileList.py
index 0d77553ad0f5969a282e69862101af550352b35b..1b7e81f5c382d8bee684e8d285d76e4e7e261f5c 100755
(executable)
--- a/
lib/python/Components/FileList.py
+++ b/
lib/python/Components/FileList.py
@@
-3,7
+3,7
@@
from os import path as os_path, listdir
from MenuList import MenuList
from Components.Harddisk import harddiskmanager
from MenuList import MenuList
from Components.Harddisk import harddiskmanager
-from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename
+from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename
, fileExists
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
eServiceReference, eServiceCenter, gFont
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
eServiceReference, eServiceCenter, gFont
@@
-23,11
+23,13
@@
EXTENSIONS = {
"ts": "movie",
"avi": "movie",
"divx": "movie",
"ts": "movie",
"avi": "movie",
"divx": "movie",
+ "m4v": "movie",
"mpg": "movie",
"mpeg": "movie",
"mkv": "movie",
"mp4": "movie",
"mpg": "movie",
"mpeg": "movie",
"mkv": "movie",
"mp4": "movie",
- "mov": "movie"
+ "mov": "movie",
+ "m2ts": "movie",
}
def FileEntryComponent(name, absolute = None, isDir = False):
}
def FileEntryComponent(name, absolute = None, isDir = False):
@@
-159,8
+161,11
@@
class FileList(MenuList):
directories.sort()
files.sort()
else:
directories.sort()
files.sort()
else:
- if os_path.exists(directory):
- files = listdir(directory)
+ if fileExists(directory):
+ try:
+ files = listdir(directory)
+ except:
+ files = []
files.sort()
tmpfiles = files[:]
for x in tmpfiles:
files.sort()
tmpfiles = files[:]
for x in tmpfiles:
@@
-192,6
+197,9
@@
class FileList(MenuList):
if (self.matchingPattern is None) or re_compile(self.matchingPattern).search(path):
self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
if (self.matchingPattern is None) or re_compile(self.matchingPattern).search(path):
self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
+ if self.showMountpoints and len(self.list) == 0:
+ self.list.append(FileEntryComponent(name = _("nothing connected"), absolute = None, isDir = False))
+
self.l.setList(self.list)
if select is not None:
self.l.setList(self.list)
if select is not None:
@@
-373,8
+381,11
@@
class MultiFileSelectList(FileList):
directories.sort()
files.sort()
else:
directories.sort()
files.sort()
else:
- if os_path.exists(directory):
- files = listdir(directory)
+ if fileExists(directory):
+ try:
+ files = listdir(directory)
+ except:
+ files = []
files.sort()
tmpfiles = files[:]
for x in tmpfiles:
files.sort()
tmpfiles = files[:]
for x in tmpfiles: