move the plugins into their own directory and every plugin has a main python file...

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

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 7c8931592adf505eb0e9ce62d54ad09d29ad02b1..3736b7b55e519879f77b5ab15991575cf04e552e 100644 (file)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,5 +1,4 @@
 import os
-from re import *
 
 SCOPE_TRANSPONDERDATA = 0
 SCOPE_SYSETC = 1
@@ -10,6 +9,7 @@ SCOPE_USERETC = 5
 SCOPE_CONFIG = 6
 SCOPE_LANGUAGE = 7
 SCOPE_HDD = 8
+SCOPE_PLUGINS = 9
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -19,6 +19,7 @@ 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),
 
@@ -92,10 +93,7 @@ def getRecordingFilename(basename):
        non_allowed_characters = "/.\\"
        filename = ""
        
-       re = compile('\xc2\x86')
-       basename = re.sub('', basename)
-       re = compile('\xc2\x87')
-       basename = re.sub('', basename)
+       basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
        
        for c in basename:
                if c in non_allowed_characters: