add possibility to choose record location on timer creation and choose

[vuplus_dvbapp] / lib / python / Tools / Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 975d3ad..1e35722 100644 (file)
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from os import path as os_path, mkdir, system
+from os import path as os_path, mkdir, rmdir, system, walk
+from re import compile
 
 SCOPE_TRANSPONDERDATA = 0
 SCOPE_SYSETC = 1
@@ -13,6 +14,10 @@ SCOPE_HDD = 8
 SCOPE_PLUGINS = 9
 SCOPE_MEDIA = 10
 SCOPE_PLAYLIST = 11
+SCOPE_CURRENT_SKIN = 12
+SCOPE_DEFAULTDIR = 13
+SCOPE_DEFAULTPARTITION = 14
+SCOPE_DEFAULTPARTITIONMOUNTDIR = 14
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -23,7 +28,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),
@@ -32,9 +37,13 @@ defaultPaths = {
                SCOPE_MEDIA: ("/media/", PATH_DONTCREATE),
                SCOPE_PLAYLIST: ("/etc/enigma2/playlist/", PATH_CREATE),
                
-               SCOPE_USERETC: ("", PATH_DONTCREATE) # user home directory
+               SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory
+               
+               SCOPE_DEFAULTDIR: ("/usr/share/enigma2/defaults/", PATH_CREATE),
+               SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/4", PATH_DONTCREATE),
+               SCOPE_DEFAULTPARTITIONMOUNTDIR: ("/usr/share/enigma2/dealer", PATH_CREATE),
        }
-       
+
 FILE_COPY = 0 # copy files from fallback dir to the basedir
 FILE_MOVE = 1 # move files
 PATH_COPY = 2 # copy the complete fallback dir to the basedir
@@ -55,44 +64,51 @@ def resolveFilename(scope, base = "", path_prefix = None):
        if base[0:1] == '/':
                return base
 
-       path = defaultPaths[scope]
+       if scope == SCOPE_CURRENT_SKIN:
+               from Components.config import config
+               tmp = defaultPaths[SCOPE_SKIN]
+               pos = config.skin.primary_skin.value.rfind('/')
+               if pos != -1:
+                       path = tmp[0]+config.skin.primary_skin.value[:pos+1]
+               else:
+                       path = tmp[0]
+       else:
+               tmp = defaultPaths[scope]
+               path = tmp[0]
 
-       if path[1] == PATH_CREATE:
-               if (not pathExists(defaultPaths[scope][0])):
-                       mkdir(path[0])
-                       
-       #if len(base) > 0 and base[0] == '/':
-               #path = ("", None)
-       
-       if not fileExists(path[0] + base):
-               #try:
-               if fallbackPaths.has_key(scope):
-                       for x in fallbackPaths[scope]:
-                               if x[1] == FILE_COPY:
-                                       if fileExists(x[0] + base):
-                                               system("cp " + x[0] + base + " " + path[0] + base)
-                                               break
-                               elif x[1] == FILE_MOVE:
-                                       if fileExists(x[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]):
-                                                       mkdir(path[0])
-                                               system("cp -a " + x[0] + "* " + path[0])
-                                               break
-                               elif x[1] == PATH_MOVE:
-                                       if pathExists(x[0]):
-                                               system("mv " + x[0] + " " + path[0])
-                                               break
+       flags = tmp[1]
 
-       
-       # FIXME: we also have to handle DATADIR etc. here.
-       return path[0] + base
+       if flags == PATH_CREATE:
+               if not pathExists(path):
+                       mkdir(path)
+
+       fallbackPath = fallbackPaths.get(scope)
+
+       if fallbackPath and not fileExists(path + base):
+               for x in fallbackPath:
+                       if x[1] == FILE_COPY:
+                               if fileExists(x[0] + base):
+                                       system("cp " + x[0] + base + " " + path + base)
+                                       break
+                       elif x[1] == FILE_MOVE:
+                               if fileExists(x[0] + base):
+                                       system("mv " + x[0] + base + " " + path + base)
+                                       break
+                       elif x[1] == PATH_COPY:
+                               if pathExists(x[0]):
+                                       if not pathExists(defaultPaths[scope][0]):
+                                               mkdir(path)
+                                       system("cp -a " + x[0] + "* " + path)
+                                       break
+                       elif x[1] == PATH_MOVE:
+                               if pathExists(x[0]):
+                                       system("mv " + x[0] + " " + path)
+                                       break
 
+       # FIXME: we also have to handle DATADIR etc. here.
+       return path + base
        # this is only the BASE - an extension must be added later.
-       
+
 def pathExists(path):
        return os_path.exists(path)
 
@@ -105,17 +121,26 @@ def createDir(path):
                ret = 1
        return ret
 
-def fileExists(f):
+def removeDir(path):
        try:
-               file = open(f)
+               rmdir(path)
+       except:
+               ret = 0
+       else:
+               ret = 1
+       return ret
+
+def fileExists(f, mode='r'):
+       try:
+               file = open(f, mode)
        except IOError:
                exists = 0
        else:
                exists = 1
        return exists
 
-def getRecordingFilename(basename):
-               # filter out non-allowed characters
+def getRecordingFilename(basename, dirname = None):
+       # filter out non-allowed characters
        non_allowed_characters = "/.\\:*?<>|\""
        filename = ""
        
@@ -125,7 +150,10 @@ def getRecordingFilename(basename):
                if c in non_allowed_characters:
                        c = "_"
                filename += c
-       
+
+       if dirname is not None:
+               filename = ''.join([dirname, filename])
+
        i = 0
        while True:
                path = resolveFilename(SCOPE_HDD, filename)
@@ -143,3 +171,14 @@ def InitFallbackFiles():
        resolveFilename(SCOPE_CONFIG, "bouquets.tv")
        resolveFilename(SCOPE_CONFIG, "userbouquet.favourites.radio")
        resolveFilename(SCOPE_CONFIG, "bouquets.radio")
+
+# returns a list of tuples containing pathname and filename matching the given pattern
+# example-pattern: match all txt-files: ".*\.txt$"
+def crawlDirectory(directory, pattern):
+       expression = compile(pattern)
+       list = []
+       for root, dirs, files in walk(directory):
+               for file in files:
+                       if expression.match(file) is not None:
+                               list.append((root, file))
+       return list