X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FTools%2FDirectories.py;h=8ed2c8a46017951c8702db09bd1047d3a6094c99;hp=7dcd5876e9660c16911520512146b15b3a036b1f;hb=eeda01368cface7208fd221ac82f4ff4a44115e3;hpb=a4b8eb676ba549ebe8cf347f15888e51d8914789

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
old mode 100644
new mode 100755
index 7dcd587..8ed2c8a
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -31,7 +31,9 @@ SCOPE_PLAYLIST = 11
 SCOPE_CURRENT_SKIN = 12
 SCOPE_DEFAULTDIR = 13
 SCOPE_DEFAULTPARTITION = 14
-SCOPE_DEFAULTPARTITIONMOUNTDIR = 14
+SCOPE_DEFAULTPARTITIONMOUNTDIR = 15
+SCOPE_METADIR = 16
+SCOPE_CURRENT_PLUGIN = 17
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -42,7 +44,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 +58,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/meta", PATH_CREATE),
 	}
 
 FILE_COPY = 0 # copy files from fallback dir to the basedir
@@ -83,7 +86,27 @@ def resolveFilename(scope, base = "", path_prefix = None):
 		tmp = defaultPaths[SCOPE_SKIN]
 		pos = config.skin.primary_skin.value.rfind('/')
 		if pos != -1:
-			path = tmp[0]+config.skin.primary_skin.value[:pos+1]
+			#if basefile is not available use default skin path as fallback
+			tmpfile = tmp[0]+config.skin.primary_skin.value[:pos+1] + base
+			if fileExists(tmpfile):
+				path = tmp[0]+config.skin.primary_skin.value[:pos+1]
+			else:
+				path = tmp[0]
+		else:
+			path = tmp[0]
+
+	elif scope == SCOPE_CURRENT_PLUGIN:
+		tmp = defaultPaths[SCOPE_PLUGINS]
+		from Components.config import config
+		skintmp = defaultPaths[SCOPE_SKIN]
+		pos = config.skin.primary_skin.value.rfind('/')
+		if pos != -1:
+			#if basefile is not available inside current skin path, use the original provided file as fallback
+			skintmpfile = skintmp[0]+config.skin.primary_skin.value[:pos+1] + base
+			if fileExists(skintmpfile):
+				path = skintmp[0]+config.skin.primary_skin.value[:pos+1]
+			else:
+				path = tmp[0]
 		else:
 			path = tmp[0]
 	else:
@@ -167,13 +190,18 @@ 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))
 
+	while len(filename) > 240:
+		filename = filename.decode('UTF-8')
+		filename = filename[:-1]
+		filename = filename.encode('UTF-8')
+
 	i = 0
 	while True:
 		path = resolveFilename(SCOPE_HDD, filename)
@@ -255,3 +283,14 @@ def copytree(src, dst, symlinks=False):
 			utime(dst, (st.st_atime, st.st_mtime))
 	except:
 		print "copy stats for", src, "failed!"
+
+def getSize(path, pattern=".*"):
+	path_size = 0
+	if os_path.isdir(path):
+		files = crawlDirectory(path, pattern)
+		for file in files:
+			filepath = os_path.join(file[0], file[1])
+			path_size += os_path.getsize(filepath)
+	elif os_path.isfile(path):
+		path_size = os_path.getsize(path)
+	return path_size