X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/92e7741435452d53cb74df0fcfa8192ec251a659..bb3daebb06398321acc6a5742a1ac3dba47a6e1a:/lib/python/Tools/Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 8fb5c092..f7be9535 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -9,6 +9,8 @@ SCOPE_USERETC = 5
 SCOPE_CONFIG = 6
 SCOPE_LANGUAGE = 7
 SCOPE_HDD = 8
+SCOPE_PLUGINS = 9
+SCOPE_MEDIA = 10
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -18,12 +20,14 @@ defaultPaths = {
 		SCOPE_SYSETC: ("/etc/", PATH_DONTCREATE),
 		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_CREATE),
 
 		SCOPE_SKIN: ("/usr/share/enigma2/", PATH_DONTCREATE),
 		SCOPE_SKIN_IMAGE: ("/usr/share/enigma2/", PATH_DONTCREATE),
 		SCOPE_HDD: ("/hdd/movie/", PATH_DONTCREATE),
+		SCOPE_MEDIA: ("/media/", PATH_DONTCREATE),
 		
 		SCOPE_USERETC: ("", PATH_DONTCREATE) # user home directory
 	}
@@ -38,35 +42,48 @@ fallbackPaths = {
 		SCOPE_HDD: [("/hdd/movies", PATH_MOVE)]
 	}
 
-def resolveFilename(scope, base = ""):
-	print "getting scope", scope, "with base", base
+def resolveFilename(scope, base = "", path_prefix = None):
+	if base[0:2] == "~/":
+		# you can only use the ~/ if we have a prefix directory
+		assert path_prefix is not None
+		base = os.path.join(path_prefix, base[2:])
+
+	# don't resolve absolute paths
+	if base[0:1] == '/':
+		return base
+
 	path = defaultPaths[scope]
-	print "path:", path
+
+	if path[1] == PATH_CREATE:
+		if (not pathExists(defaultPaths[scope][0])):
+			os.mkdir(path[0])
+			
+	#if len(base) > 0 and base[0] == '/':
+		#path = ("", None)
 	
 	if not fileExists(path[0] + base):
 		#try:
 		if fallbackPaths.has_key(scope):
-			print 1
 			for x in fallbackPaths[scope]:
-				print x
 				if x[1] == FILE_COPY:
 					if fileExists(x[0] + base):
 						os.system("cp " + x[0] + base + " " + path[0] + base)
+						break
 				elif x[1] == FILE_MOVE:
 					if fileExists(x[0] + base):
 						os.system("mv " + x[0] + base + " " + path[0] + base)
+						break
 				elif x[1] == PATH_COPY:
 					if pathExists(x[0]):
 						if not pathExists(defaultPaths[scope][0]):
 							os.mkdir(path[0])
 						os.system("cp -a " + x[0] + "* " + path[0])
+						break
 				elif x[1] == PATH_MOVE:
 					if pathExists(x[0]):
 						os.system("mv " + x[0] + " " + path[0])
+						break
 
-		if path[1] == PATH_CREATE:
-			if (not pathExists(defaultPaths[scope][0])):
-				os.mkdir(path[0])
 	
 	# FIXME: we also have to handle DATADIR etc. here.
 	return path[0] + base
@@ -86,11 +103,12 @@ def fileExists(f):
 	return exists
 
 def getRecordingFilename(basename):
-	
 		# filter out non-allowed characters
-	non_allowed_characters = "/.\\"
-	
+	non_allowed_characters = "/.\\:*?<>|\""
 	filename = ""
+	
+	basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
+	
 	for c in basename:
 		if c in non_allowed_characters:
 			c = "_"