tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/ is not a principal

Browse Source
This commit is contained in:
Unrud
2016-08-01 20:46:57 +02:00
parent 7aa481aaa1
commit 03cbcee5cd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/storage.py
View File

@@ -355,25 +355,27 @@ class Collection(BaseCollection):
# path should already be sanitized # path should already be sanitized
sane_path = sanitize_path(path).strip("/") sane_path = sanitize_path(path).strip("/")
attributes = sane_path.split("/") attributes = sane_path.split("/")
if not attributes: if not attributes[0]:
return attributes.pop()
# Try to guess if the path leads to a collection or an item # Try to guess if the path leads to a collection or an item
folder = os.path.expanduser( folder = os.path.expanduser(
cls.configuration.get("storage", "filesystem_folder")) cls.configuration.get("storage", "filesystem_folder"))
if not os.path.isdir(path_to_filesystem(folder, sane_path)): if not os.path.isdir(path_to_filesystem(folder, sane_path)):
# path is not a collection # path is not a collection
if os.path.isfile(path_to_filesystem(folder, sane_path)): if attributes and os.path.isfile(path_to_filesystem(folder,
sane_path)):
# path is an item # path is an item
attributes.pop() attributes.pop()
elif os.path.isdir(path_to_filesystem(folder, *attributes[:-1])): elif attributes and os.path.isdir(path_to_filesystem(
folder, *attributes[:-1])):
# path parent is a collection # path parent is a collection
attributes.pop() attributes.pop()
# TODO: else: return? # TODO: else: return?
path = "/".join(attributes) path = "/".join(attributes)
principal = len(attributes) <= 1 principal = len(attributes) == 1
collection = cls(path, principal) collection = cls(path, principal)
yield collection yield collection
if depth != "0": if depth != "0":