filter out short name brakets in record filenames

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

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 8fb5c09278cb1db31bdb9f81562967c9cc6c8a97..7c8931592adf505eb0e9ce62d54ad09d29ad02b1 100644 (file)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,4 +1,5 @@
 import os
+from re import *
 
 SCOPE_TRANSPONDERDATA = 0
 SCOPE_SYSETC = 1
@@ -39,34 +40,35 @@ fallbackPaths = {
        }
 
 def resolveFilename(scope, base = ""):
-       print "getting scope", scope, "with base", base
        path = defaultPaths[scope]
-       print "path:", path
+
+       if path[1] == PATH_CREATE:
+               if (not pathExists(defaultPaths[scope][0])):
+                       os.mkdir(path[0])
        
        if not fileExists(path[0] + base):
                #try:
                if fallbackPaths.has_key(scope):
-                       print 1
                        for x in fallbackPaths[scope]:
-                               print x
                                if x[1] == FILE_COPY:
                                        if fileExists(x[0] + base):
                                                os.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)
+                                               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])
+                                               break
                                elif x[1] == PATH_MOVE:
                                        if pathExists(x[0]):
                                                os.system("mv " + x[0] + " " + path[0])
+                                               break
 
-               if path[1] == PATH_CREATE:
-                       if (not pathExists(defaultPaths[scope][0])):
-                               os.mkdir(path[0])
        
        # FIXME: we also have to handle DATADIR etc. here.
        return path[0] + base
@@ -86,11 +88,15 @@ def fileExists(f):
        return exists
 
 def getRecordingFilename(basename):
-       
                # filter out non-allowed characters
        non_allowed_characters = "/.\\"
-       
        filename = ""
+       
+       re = compile('\xc2\x86')
+       basename = re.sub('', basename)
+       re = compile('\xc2\x87')
+       basename = re.sub('', basename)
+       
        for c in basename:
                if c in non_allowed_characters:
                        c = "_"