X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08fca93e7f2a37a452399d08c5c84b969b7e52af..6e2d6155a8b832247ecedb66f6c4c8aea947f8f7:/lib/python/Tools/Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index d6ffeeea..71b44875 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 
 SCOPE_TRANSPONDERDATA = 0
@@ -22,7 +23,7 @@ defaultPaths = {
 		SCOPE_CONFIG: ("/etc/enigma2/", PATH_CREATE),
 		SCOPE_PLUGINS: ("/usr/lib/enigma2/python/Plugins/", PATH_CREATE),
 					    
-		SCOPE_LANGUAGE: ("/usr/share/enigma2/po/", PATH_CREATE),
+		SCOPE_LANGUAGE: ("/usr/share/enigma2/po/", PATH_DONTCREATE),
 
 		SCOPE_SKIN: ("/usr/share/enigma2/", PATH_DONTCREATE),
 		SCOPE_SKIN_IMAGE: ("/usr/share/enigma2/", PATH_DONTCREATE),
@@ -42,10 +43,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]
@@ -89,6 +94,15 @@ def resolveFilename(scope, base = ""):
 def pathExists(path):
 	return os.path.exists(path)
 
+def createDir(path):
+	try:
+		os.mkdir(path)
+	except:
+		ret = 0
+	else:
+		ret = 1
+	return ret
+
 def fileExists(f):
 	try:
 		file = open(f)
@@ -100,7 +114,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', '')
@@ -125,3 +139,5 @@ def getRecordingFilename(basename):
 def InitFallbackFiles():
 	resolveFilename(SCOPE_CONFIG, "userbouquet.favourites.tv")
 	resolveFilename(SCOPE_CONFIG, "bouquets.tv")
+	resolveFilename(SCOPE_CONFIG, "userbouquet.favourites.radio")
+	resolveFilename(SCOPE_CONFIG, "bouquets.radio")