X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/753161b26ec6d7d068e61e6ce7063369740476a0..01261afa97d904fa9b2564aedabe1363d87ff186:/lib/python/Tools/Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
old mode 100644
new mode 100755
index 576d2773..0a06467b
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from os import path as os_path, mkdir, rmdir, system, walk, stat as os_stat, listdir, readlink, makedirs, error as os_error, symlink
+from os import path as os_path, mkdir, rmdir, system, walk, stat as os_stat, listdir, readlink, makedirs, error as os_error, symlink, access, F_OK, R_OK, W_OK
 from stat import S_IMODE
 from re import compile
 
@@ -31,7 +31,8 @@ SCOPE_PLAYLIST = 11
 SCOPE_CURRENT_SKIN = 12
 SCOPE_DEFAULTDIR = 13
 SCOPE_DEFAULTPARTITION = 14
-SCOPE_DEFAULTPARTITIONMOUNTDIR = 14
+SCOPE_DEFAULTPARTITIONMOUNTDIR = 15
+SCOPE_METADIR = 16
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -42,7 +43,7 @@ defaultPaths = {
 		SCOPE_FONTS: ("/usr/share/fonts/", PATH_DONTCREATE),
 		SCOPE_CONFIG: ("/etc/enigma2/", PATH_CREATE),
 		SCOPE_PLUGINS: ("/usr/lib/enigma2/python/Plugins/", PATH_CREATE),
-    
+
 		SCOPE_LANGUAGE: ("/usr/share/enigma2/po/", PATH_DONTCREATE),
 
 		SCOPE_SKIN: ("/usr/share/enigma2/", PATH_DONTCREATE),
@@ -56,6 +57,7 @@ defaultPaths = {
 		SCOPE_DEFAULTDIR: ("/usr/share/enigma2/defaults/", PATH_CREATE),
 		SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE),
 		SCOPE_DEFAULTPARTITIONMOUNTDIR: ("/usr/share/enigma2/dealer", PATH_CREATE),
+		SCOPE_METADIR: ("/usr/share/enigma2/meta", PATH_CREATE),
 	}
 
 FILE_COPY = 0 # copy files from fallback dir to the basedir
@@ -126,9 +128,15 @@ def resolveFilename(scope, base = "", path_prefix = None):
 def pathExists(path):
 	return os_path.exists(path)
 
-def createDir(path):
+def isMount(path):
+	return os_path.ismount(path)
+
+def createDir(path, makeParents = False):
 	try:
-		mkdir(path)
+		if makeParents:
+			makedirs(path)
+		else:
+			mkdir(path)
 	except:
 		ret = 0
 	else:
@@ -145,13 +153,13 @@ def removeDir(path):
 	return ret
 
 def fileExists(f, mode='r'):
-	try:
-		file = open(f, mode)
-	except IOError:
-		exists = 0
+	if mode == 'r':
+		acc_mode = R_OK
+	elif mode == 'w':
+		acc_mode = W_OK
 	else:
-		exists = 1
-	return exists
+		acc_mode = F_OK
+	return access(f, acc_mode)
 
 def getRecordingFilename(basename, dirname = None):
 	# filter out non-allowed characters
@@ -161,12 +169,12 @@ def getRecordingFilename(basename, dirname = None):
 	basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
 	
 	for c in basename:
-		if c in non_allowed_characters:
+		if c in non_allowed_characters or ord(c) < 32:
 			c = "_"
 		filename += c
 
 	if dirname is not None:
-		filename = ''.join([dirname, filename])
+		filename = ''.join((dirname, filename))
 
 	i = 0
 	while True: