X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4256de6951e73b66cf57933f74ac1f41c954e95d..05aa25aa522a21bd5594fd774b8685afd33fb69b:/lib/python/Tools/Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 123e1bf8..975d3ade 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,4 +1,5 @@
-import os
+# -*- coding: utf-8 -*-
+from os import path as os_path, mkdir, system
 
 SCOPE_TRANSPONDERDATA = 0
 SCOPE_SYSETC = 1
@@ -10,6 +11,8 @@ SCOPE_CONFIG = 6
 SCOPE_LANGUAGE = 7
 SCOPE_HDD = 8
 SCOPE_PLUGINS = 9
+SCOPE_MEDIA = 10
+SCOPE_PLAYLIST = 11
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -21,11 +24,13 @@ 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),
 		SCOPE_HDD: ("/hdd/movie/", PATH_DONTCREATE),
+		SCOPE_MEDIA: ("/media/", PATH_DONTCREATE),
+		SCOPE_PLAYLIST: ("/etc/enigma2/playlist/", PATH_CREATE),
 		
 		SCOPE_USERETC: ("", PATH_DONTCREATE) # user home directory
 	}
@@ -40,17 +45,21 @@ 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]
 
 	if path[1] == PATH_CREATE:
 		if (not pathExists(defaultPaths[scope][0])):
-			os.mkdir(path[0])
+			mkdir(path[0])
 			
 	#if len(base) > 0 and base[0] == '/':
 		#path = ("", None)
@@ -61,21 +70,21 @@ def resolveFilename(scope, base = ""):
 			for x in fallbackPaths[scope]:
 				if x[1] == FILE_COPY:
 					if fileExists(x[0] + base):
-						os.system("cp " + x[0] + base + " " + path[0] + base)
+						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)
+						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])
+							mkdir(path[0])
+						system("cp -a " + x[0] + "* " + path[0])
 						break
 				elif x[1] == PATH_MOVE:
 					if pathExists(x[0]):
-						os.system("mv " + x[0] + " " + path[0])
+						system("mv " + x[0] + " " + path[0])
 						break
 
 	
@@ -85,7 +94,16 @@ def resolveFilename(scope, base = ""):
 	# this is only the BASE - an extension must be added later.
 	
 def pathExists(path):
-	return os.path.exists(path)
+	return os_path.exists(path)
+
+def createDir(path):
+	try:
+		mkdir(path)
+	except:
+		ret = 0
+	else:
+		ret = 1
+	return ret
 
 def fileExists(f):
 	try:
@@ -98,7 +116,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', '')
@@ -123,3 +141,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")