git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for default ac3
[enigma2.git]
/
lib
/
python
/
Tools
/
Directories.py
diff --git
a/lib/python/Tools/Directories.py
b/lib/python/Tools/Directories.py
index 051a8efe6a428edeb69b0e638e83956f10ff8fc6..f7be95359be7b26302269abfd44389de3183994c 100644
(file)
--- a/
lib/python/Tools/Directories.py
+++ b/
lib/python/Tools/Directories.py
@@
-42,10
+42,14
@@
fallbackPaths = {
SCOPE_HDD: [("/hdd/movies", PATH_MOVE)]
}
SCOPE_HDD: [("/hdd/movies", PATH_MOVE)]
}
-def resolveFilename(scope, base = ""):
+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:])
# don't resolve absolute paths
# don't resolve absolute paths
- if
len(base) and base[0
] == '/':
+ if
base[0:1
] == '/':
return base
path = defaultPaths[scope]
return base
path = defaultPaths[scope]
@@
-100,7
+104,7
@@
def fileExists(f):
def getRecordingFilename(basename):
# filter out non-allowed characters
def getRecordingFilename(basename):
# filter out non-allowed characters
- non_allowed_characters = "/.\\:\""
+ non_allowed_characters = "/.\\:
*?<>|
\""
filename = ""
basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
filename = ""
basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')