X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FTools%2FDirectories.py;h=1e35722d06e758dfed114ef1ddc34ac38b0526c8;hp=f7a589b5024909215fd0e99ecee85817800c5839;hb=04f4636324ab06c5a3a4f618100048e159eaf6f9;hpb=decf70e35b1322c4b995538180ccf757d84fd4f9 diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py index f7a589b..1e35722 100644 --- a/lib/python/Tools/Directories.py +++ b/lib/python/Tools/Directories.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -import os +from os import path as os_path, mkdir, rmdir, system, walk +from re import compile SCOPE_TRANSPONDERDATA = 0 SCOPE_SYSETC = 1 @@ -12,6 +13,11 @@ SCOPE_LANGUAGE = 7 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 @@ -22,17 +28,22 @@ 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_CREATE), + + SCOPE_LANGUAGE: ("/usr/share/enigma2/po/", PATH_DONTCREATE), 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_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 @@ -47,64 +58,89 @@ 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:]) + base = os_path.join(path_prefix, base[2:]) # don't resolve absolute paths 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])): - os.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): - 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 + 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) + return os_path.exists(path) + +def createDir(path): + try: + mkdir(path) + except: + ret = 0 + else: + 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 = "" @@ -114,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) @@ -130,3 +169,16 @@ def getRecordingFilename(basename): def InitFallbackFiles(): resolveFilename(SCOPE_CONFIG, "userbouquet.favourites.tv") 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