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

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index aaa2a9d..8ed2c8a 100755
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -33,6 +33,7 @@ SCOPE_DEFAULTDIR = 13
 SCOPE_DEFAULTPARTITION = 14
 SCOPE_DEFAULTPARTITIONMOUNTDIR = 15
 SCOPE_METADIR = 16
+SCOPE_CURRENT_PLUGIN = 17
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -57,7 +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/lib/enigma2/python/Plugins/meta", PATH_CREATE),
+		SCOPE_METADIR: ("/usr/share/meta", PATH_CREATE),
 	}
 
 FILE_COPY = 0 # copy files from fallback dir to the basedir
@@ -85,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: