git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try skindir/picon_default.png before use default enigma2.png
[enigma2.git]
/
lib
/
python
/
Tools
/
Directories.py
diff --git
a/lib/python/Tools/Directories.py
b/lib/python/Tools/Directories.py
index 0a703e7cd9328b89dc027115538212ae543c6b93..975d3ade64f1f746a8c9fc976b42771f4d14d2ea 100644
(file)
--- a/
lib/python/Tools/Directories.py
+++ b/
lib/python/Tools/Directories.py
@@
-1,5
+1,5
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-import os
+from os import path as os_path, mkdir, system
SCOPE_TRANSPONDERDATA = 0
SCOPE_SYSETC = 1
SCOPE_TRANSPONDERDATA = 0
SCOPE_SYSETC = 1
@@
-49,7
+49,7
@@
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
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] == '/':
# don't resolve absolute paths
if base[0:1] == '/':
@@
-59,7
+59,7
@@
def resolveFilename(scope, base = "", path_prefix = None):
if path[1] == PATH_CREATE:
if (not pathExists(defaultPaths[scope][0])):
if path[1] == PATH_CREATE:
if (not pathExists(defaultPaths[scope][0])):
-
os.
mkdir(path[0])
+ mkdir(path[0])
#if len(base) > 0 and base[0] == '/':
#path = ("", None)
#if len(base) > 0 and base[0] == '/':
#path = ("", None)
@@
-70,21
+70,21
@@
def resolveFilename(scope, base = "", path_prefix = None):
for x in fallbackPaths[scope]:
if x[1] == FILE_COPY:
if fileExists(x[0] + base):
for x in fallbackPaths[scope]:
if x[1] == FILE_COPY:
if fileExists(x[0] + base):
-
os.
system("cp " + x[0] + base + " " + path[0] + base)
+ system("cp " + x[0] + base + " " + path[0] + base)
break
elif x[1] == FILE_MOVE:
if fileExists(x[0] + base):
break
elif x[1] == FILE_MOVE:
if fileExists(x[0] + base):
-
os.
system("mv " + x[0] + base + " " + path[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]):
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])
+ mkdir(path[0])
+ system("cp -a " + x[0] + "* " + path[0])
break
elif x[1] == PATH_MOVE:
if pathExists(x[0]):
break
elif x[1] == PATH_MOVE:
if pathExists(x[0]):
-
os.
system("mv " + x[0] + " " + path[0])
+ system("mv " + x[0] + " " + path[0])
break
break
@@
-94,11
+94,11
@@
def resolveFilename(scope, base = "", path_prefix = None):
# this is only the BASE - an extension must be added later.
def pathExists(path):
# 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:
def createDir(path):
try:
-
os.
mkdir(path)
+ mkdir(path)
except:
ret = 0
else:
except:
ret = 0
else: