git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_246_cutlistedit' into experimental
[enigma2.git]
/
lib
/
python
/
Components
/
FileList.py
diff --git
a/lib/python/Components/FileList.py
b/lib/python/Components/FileList.py
index f96970946cad1a8fb248d713fc5435a43a0e8bd1..a0f66bd1b7091ae5363e466f8f0151ec07dccacc 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_SKIN_IMAGE, resolveFilename
+from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
, fileExists
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
eServiceReference, eServiceCenter, gFont
from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
eServiceReference, eServiceCenter, gFont
@@
-26,7
+26,8
@@
EXTENSIONS = {
"mpg": "movie",
"mpeg": "movie",
"mkv": "movie",
"mpg": "movie",
"mpeg": "movie",
"mkv": "movie",
- "mp4": "movie"
+ "mp4": "movie",
+ "mov": "movie"
}
def FileEntryComponent(name, absolute = None, isDir = False):
}
def FileEntryComponent(name, absolute = None, isDir = False):
@@
-158,8
+159,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:
@@
-372,8
+376,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: