Directories.py: max filename length without extension is now 240 characters.. (ext3...

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

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
old mode 100644 (file)
new mode 100755 (executable)
index 0d238b3..2380ed9
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -31,7 +31,8 @@ SCOPE_PLAYLIST = 11
 SCOPE_CURRENT_SKIN = 12
 SCOPE_DEFAULTDIR = 13
 SCOPE_DEFAULTPARTITION = 14
-SCOPE_DEFAULTPARTITIONMOUNTDIR = 14
+SCOPE_DEFAULTPARTITIONMOUNTDIR = 15
+SCOPE_METADIR = 16
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -42,7 +43,7 @@ defaultPaths = {
                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_DONTCREATE),
 
                SCOPE_SKIN: ("/usr/share/enigma2/", PATH_DONTCREATE),
@@ -56,6 +57,7 @@ defaultPaths = {
                SCOPE_DEFAULTDIR: ("/usr/share/enigma2/defaults/", PATH_CREATE),
                SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE),
                SCOPE_DEFAULTPARTITIONMOUNTDIR: ("/usr/share/enigma2/dealer", PATH_CREATE),
+               SCOPE_METADIR: ("/usr/lib/enigma2/python/Plugins/meta", PATH_CREATE),
        }
 
 FILE_COPY = 0 # copy files from fallback dir to the basedir
@@ -167,12 +169,15 @@ def getRecordingFilename(basename, dirname = None):
        basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
        
        for c in basename:
-               if c in non_allowed_characters:
+               if c in non_allowed_characters or ord(c) < 32:
                        c = "_"
                filename += c
 
        if dirname is not None:
-               filename = ''.join([dirname, filename])
+               filename = ''.join((dirname, filename))
+
+       if len(filename) > 240:
+               filename = filename[:240]
 
        i = 0
        while True: