X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FTools%2FDirectories.py;h=f7a589b5024909215fd0e99ecee85817800c5839;hp=7c8931592adf505eb0e9ce62d54ad09d29ad02b1;hb=decf70e35b1322c4b995538180ccf757d84fd4f9;hpb=65e1a8d7f5ec5c86531f1244aadfa42b1e46e63e

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 7c89315..f7a589b 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
 import os
-from re import *
 
 SCOPE_TRANSPONDERDATA = 0
 SCOPE_SYSETC = 1
@@ -10,6 +10,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
@@ -19,12 +21,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
 	}
@@ -39,12 +43,24 @@ fallbackPaths = {
 		SCOPE_HDD: [("/hdd/movies", PATH_MOVE)]
 	}
 
-def resolveFilename(scope, 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]
 
 	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:
@@ -89,13 +105,10 @@ def fileExists(f):
 
 def getRecordingFilename(basename):
 		# filter out non-allowed characters
-	non_allowed_characters = "/.\\"
+	non_allowed_characters = "/.\\:*?<>|\""
 	filename = ""
 	
-	re = compile('\xc2\x86')
-	basename = re.sub('', basename)
-	re = compile('\xc2\x87')
-	basename = re.sub('', basename)
+	basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
 	
 	for c in basename:
 		if c in non_allowed_characters: