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

Clean the calendar paths

Browse Source
This commit is contained in:
Guillaume Ayoub 2011-06-16 10:39:36 +02:00
parent af10a2f1c4
commit 1d67706b56
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
radicale/ical.py
View File

@ -163,7 +163,12 @@ class Calendar(object):
tag = "VCALENDAR" tag = "VCALENDAR"
def __init__(self, path, principal=False): def __init__(self, path, principal=False):
"""Initialize the calendar with ``cal`` and ``user`` parameters.""" """Initialize the calendar.
``path`` must be the normalized relative path of the calendar, using
the slash as the folder delimiter, with no leading nor trailing slash.
"""
self.encoding = "utf-8" self.encoding = "utf-8"
split_path = path.split("/") split_path = path.split("/")
self.owner = split_path[0] if len(split_path) > 1 else None self.owner = split_path[0] if len(split_path) > 1 else None
@ -193,8 +198,7 @@ class Calendar(object):
result = [] result = []
path = "/".join(attributes[:min(len(attributes), 2)]) path = "/".join(attributes[:min(len(attributes), 2)])
path = path.replace("/", os.sep) abs_path = os.path.join(FOLDER, path.replace("/", os.sep))
abs_path = os.path.join(FOLDER, path)
if os.path.isdir(abs_path): if os.path.isdir(abs_path):
if depth == "0": if depth == "0":
result.append(cls(path, principal=True)) result.append(cls(path, principal=True))
@ -203,9 +207,8 @@ class Calendar(object):
result.append(cls(path, principal=True)) result.append(cls(path, principal=True))
try: try:
for filename in next(os.walk(abs_path))[2]: for filename in next(os.walk(abs_path))[2]:
file_path = os.path.join(path, filename)
if cls.is_vcalendar(os.path.join(abs_path, filename)): if cls.is_vcalendar(os.path.join(abs_path, filename)):
result.append(cls(file_path)) result.append(cls(os.path.join(path, filename)))
except StopIteration: except StopIteration:
# directory does not exist yet # directory does not exist yet
pass pass
@ -413,11 +416,11 @@ class Calendar(object):
def owner_url(self): def owner_url(self):
"""Get the calendar URL according to its owner.""" """Get the calendar URL according to its owner."""
if self.owner: if self.owner:
return ('/%s/' % self.owner).replace('//', '/') return "/%s/" % self.owner
else: else:
return None return None
@property @property
def url(self): def url(self):
"""Get the standard calendar URL.""" """Get the standard calendar URL."""
return ('/%s/' % self.local_path).replace('//', '/') return "/%s/" % self.local_path

2
radicale/xmlutils.py
View File

@ -201,7 +201,7 @@ def _propfind_response(path, item, props, user):
response = ET.Element(_tag("D", "response")) response = ET.Element(_tag("D", "response"))
href = ET.Element(_tag("D", "href")) href = ET.Element(_tag("D", "href"))
href.text = item.url if is_calendar else "%s/%s" % (path, item.name) href.text = item.local_path if is_calendar else "%s/%s" % (path, item.name)
response.append(href) response.append(href)
propstat404 = ET.Element(_tag("D", "propstat")) propstat404 = ET.Element(_tag("D", "propstat"))