check if screen has already been built

[enigma2.git] / lib / python / Tools / Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 123e1bf8214099874d34bf149247516eaff68099..f7be95359be7b26302269abfd44389de3183994c 100644 (file)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -10,6 +10,7 @@ SCOPE_CONFIG = 6
 SCOPE_LANGUAGE = 7
 SCOPE_HDD = 8
 SCOPE_PLUGINS = 9
+SCOPE_MEDIA = 10
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -26,6 +27,7 @@ defaultPaths = {
                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
        }
@@ -40,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]
@@ -98,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', '')