X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/672aa42f7eaa9e5d5bb736ef55e03cbf6fce9ba2..d6ed3400b2cdfd156aa9f6504079aeab53db1f69:/lib/python/Tools/Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 37ff1aa4..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
@@ -9,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
@@ -18,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_LANGUAGE: ("/usr/share/enigma2/po/", PATH_DONTCREATE),
 
 		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,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:
@@ -77,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)
@@ -88,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', '')
@@ -113,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")