mirror of
https://github.com/Kozea/Radicale.git
synced 2025-08-01 18:18:31 +00:00
Mark attributes for internal use with underscore
This commit is contained in:
parent
9b51e495ea
commit
1453c0b72c
11 changed files with 77 additions and 74 deletions
|
@ -45,8 +45,8 @@ class ApplicationMoveMixin:
|
|||
if not self.access(user, to_path, "w"):
|
||||
return httputils.NOT_ALLOWED
|
||||
|
||||
with self.storage.acquire_lock("w", user):
|
||||
item = next(self.storage.discover(path), None)
|
||||
with self._storage.acquire_lock("w", user):
|
||||
item = next(self._storage.discover(path), None)
|
||||
if not item:
|
||||
return httputils.NOT_FOUND
|
||||
if (not self.access(user, path, "w", item) or
|
||||
|
@ -56,13 +56,13 @@ class ApplicationMoveMixin:
|
|||
# TODO: support moving collections
|
||||
return httputils.METHOD_NOT_ALLOWED
|
||||
|
||||
to_item = next(self.storage.discover(to_path), None)
|
||||
to_item = next(self._storage.discover(to_path), None)
|
||||
if isinstance(to_item, storage.BaseCollection):
|
||||
return httputils.FORBIDDEN
|
||||
to_parent_path = pathutils.unstrip_path(
|
||||
posixpath.dirname(pathutils.strip_path(to_path)), True)
|
||||
to_collection = next(
|
||||
self.storage.discover(to_parent_path), None)
|
||||
self._storage.discover(to_parent_path), None)
|
||||
if not to_collection:
|
||||
return httputils.CONFLICT
|
||||
tag = item.collection.get_meta("tag")
|
||||
|
@ -78,7 +78,7 @@ class ApplicationMoveMixin:
|
|||
"C" if tag == "VCALENDAR" else "CR", "no-uid-conflict")
|
||||
to_href = posixpath.basename(pathutils.strip_path(to_path))
|
||||
try:
|
||||
self.storage.move(item, to_collection, to_href)
|
||||
self._storage.move(item, to_collection, to_href)
|
||||
except ValueError as e:
|
||||
logger.warning(
|
||||
"Bad MOVE request on %r: %s", path, e, exc_info=True)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue