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

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 2156a9be..f7be9535 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -42,10 +42,14 @@ 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 len(base) and base[0] == '/':
+	if base[0:1] == '/':
 		return base
 
 	path = defaultPaths[scope]
@@ -100,7 +104,7 @@ def fileExists(f):
 
 def getRecordingFilename(basename):
 		# filter out non-allowed characters
-	non_allowed_characters = "/.\\:"
+	non_allowed_characters = "/.\\:*?<>|\""
 	filename = ""
 	
 	basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')