X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d58ca4cf34b7621aea4e2c1ff07bed6b2cd6b763..bbb82688540582d2049b584e5263cbc0423fb551:/lib/python/Components/FileList.py

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index f9697094..b187ee3e 100755
--- 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 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
@@ -23,10 +23,12 @@ EXTENSIONS = {
 		"ts": "movie",
 		"avi": "movie",
 		"divx": "movie",
+		"m4v": "movie",
 		"mpg": "movie",
 		"mpeg": "movie",
 		"mkv": "movie",
-		"mp4": "movie"
+		"mp4": "movie",
+		"mov": "movie"
 	}
 
 def FileEntryComponent(name, absolute = None, isDir = False):
@@ -158,8 +160,11 @@ class FileList(MenuList):
 			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:
@@ -372,8 +377,11 @@ class MultiFileSelectList(FileList):
 			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: