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

Don't serialize collection for etag

Browse Source
This commit is contained in:
Unrud 2017-07-22 21:25:28 +02:00 committed by Unrud
parent 95380c5ce7
commit debba3c7a1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
radicale/storage.py
View File

@ -445,7 +445,10 @@ class BaseCollection:
@property @property
def etag(self): def etag(self):
"""Encoded as quoted-string (see RFC 2616).""" """Encoded as quoted-string (see RFC 2616)."""
return get_etag(self.serialize()) etag = md5()
for item in self.get_all():
etag.update((item.href + "/" + item.etag).encode("utf-8"))
return '"%s"' % etag.hexdigest()
@classmethod @classmethod
def create_collection(cls, href, collection=None, props=None): def create_collection(cls, href, collection=None, props=None):
@ -1328,10 +1331,7 @@ class Collection(BaseCollection):
def etag(self): def etag(self):
# reuse cached value if the storage is read-only # reuse cached value if the storage is read-only
if self._writer or self._etag_cache is None: if self._writer or self._etag_cache is None:
etag = md5() self._etag_cache = super().etag
for item in self.get_all():
etag.update((item.href + "/" + item.etag).encode("utf-8"))
self._etag_cache = '"%s"' % etag.hexdigest()
return self._etag_cache return self._etag_cache
_lock = threading.Lock() _lock = threading.Lock()