X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/04686c6d059d527c3b6e98d4fa8a82a226e2ce65..98b800920d5ad05b854224bfa0ed0b18521788c4:/lib/python/Tools/Directories.py

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 31e72641..2b60924c 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,7 +1,21 @@
 # -*- coding: utf-8 -*-
-from os import path as os_path, mkdir, system, walk
+
+from os import path as os_path, mkdir, rmdir, system, walk, stat as os_stat, listdir, readlink, makedirs, error as os_error, symlink, access, F_OK, R_OK, W_OK
+from stat import S_IMODE
 from re import compile
 
+try:
+	from os import chmod
+	have_chmod = True
+except:
+	have_chmod = False
+
+try:
+	from os import utime
+	have_utime = True
+except:
+	have_utime = False
+
 SCOPE_TRANSPONDERDATA = 0
 SCOPE_SYSETC = 1
 SCOPE_FONTS = 2
@@ -17,6 +31,7 @@ SCOPE_PLAYLIST = 11
 SCOPE_CURRENT_SKIN = 12
 SCOPE_DEFAULTDIR = 13
 SCOPE_DEFAULTPARTITION = 14
+SCOPE_DEFAULTPARTITIONMOUNTDIR = 14
 
 PATH_CREATE = 0
 PATH_DONTCREATE = 1
@@ -39,7 +54,8 @@ defaultPaths = {
 		SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory
 		
 		SCOPE_DEFAULTDIR: ("/usr/share/enigma2/defaults/", PATH_CREATE),
-		SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/4", PATH_DONTCREATE),
+		SCOPE_DEFAULTPARTITION: ("/dev/mtdblock/6", PATH_DONTCREATE),
+		SCOPE_DEFAULTPARTITIONMOUNTDIR: ("/usr/share/enigma2/dealer", PATH_CREATE),
 	}
 
 FILE_COPY = 0 # copy files from fallback dir to the basedir
@@ -110,23 +126,35 @@ def resolveFilename(scope, base = "", path_prefix = None):
 def pathExists(path):
 	return os_path.exists(path)
 
-def createDir(path):
+def createDir(path, makeParents = False):
 	try:
-		mkdir(path)
+		if makeParents:
+			makedirs(path)
+		else:
+			mkdir(path)
 	except:
 		ret = 0
 	else:
 		ret = 1
 	return ret
 
-def fileExists(f, mode='r'):
+def removeDir(path):
 	try:
-		file = open(f, mode)
-	except IOError:
-		exists = 0
+		rmdir(path)
+	except:
+		ret = 0
+	else:
+		ret = 1
+	return ret
+
+def fileExists(f, mode='r'):
+	if mode == 'r':
+		acc_mode = R_OK
+	elif mode == 'w':
+		acc_mode = W_OK
 	else:
-		exists = 1
-	return exists
+		acc_mode = F_OK
+	return access(f, acc_mode)
 
 def getRecordingFilename(basename, dirname = None):
 	# filter out non-allowed characters
@@ -171,3 +199,56 @@ def crawlDirectory(directory, pattern):
 			if expression.match(file) is not None:
 				list.append((root, file))
 	return list
+
+def copyfile(src, dst):
+	try:
+		f1 = open(src, "rb")
+		if os_path.isdir(dst):
+			dst = os_path.join(dst, os_path.basename(src))
+		f2 = open(dst, "w+b")
+		while True:
+			buf = f1.read(16*1024)
+			if not buf:
+				break
+			f2.write(buf)
+		st = os_stat(src)
+		mode = S_IMODE(st.st_mode)
+		if have_chmod:
+			chmod(dst, mode)
+		if have_utime:
+			utime(dst, (st.st_atime, st.st_mtime))
+	except:
+		print "copy", src, "to", dst, "failed!"
+		return -1
+	return 0
+
+def copytree(src, dst, symlinks=False):
+	names = listdir(src)
+	if os_path.isdir(dst):
+		dst = os_path.join(dst, os_path.basename(src))
+		if not os_path.isdir(dst):
+			mkdir(dst)
+	else:
+		makedirs(dst)
+	for name in names:
+		srcname = os_path.join(src, name)
+		dstname = os_path.join(dst, name)
+		try:
+			if symlinks and os_path.islink(srcname):
+				linkto = readlink(srcname)
+				symlink(linkto, dstname)
+			elif os_path.isdir(srcname):
+				copytree(srcname, dstname, symlinks)
+			else:
+				copyfile(srcname, dstname)
+		except:
+			print "dont copy srcname (no file or link or folder)"
+	try:
+		st = os_stat(src)
+		mode = S_IMODE(st.st_mode)
+		if have_chmod:
+			chmod(dst, mode)
+		if have_utime:
+			utime(dst, (st.st_atime, st.st_mtime))
+	except:
+		print "copy stats for", src, "failed!"