1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00

Code cleanup and refactoring

This commit is contained in:
Tuna Celik 2020-08-17 02:14:04 +02:00
parent 5253a464ab
commit 389a6b9906
5 changed files with 41 additions and 31 deletions

View file

@ -29,7 +29,7 @@ from radicale import app, httputils
from radicale import item as radicale_item
from radicale import pathutils, rights, storage, xmlutils
from radicale.log import logger
from radicale.hook.rabbitmq import QueueItem, QueueItemTypes
from radicale.hook import HookNotificationItem, HookNotificationItemTypes
MIMETYPE_TAGS = {value: key for key, value in xmlutils.MIMETYPES.items()}
@ -195,7 +195,9 @@ class ApplicationPutMixin:
etag = self._storage.create_collection(
path, prepared_items, props).etag
for item in prepared_items:
self._hook.notify(QueueItem(QueueItemTypes.UPSERT, item.serialize()))
hook_notification_item = \
HookNotificationItem(HookNotificationItemTypes.UPSERT, item.serialize())
self._hook.notify(hook_notification_item)
except ValueError as e:
logger.warning(
"Bad PUT request on %r: %s", path, e, exc_info=True)
@ -211,7 +213,9 @@ class ApplicationPutMixin:
href = posixpath.basename(pathutils.strip_path(path))
try:
etag = parent_item.upload(href, prepared_item).etag
self._hook.notify(QueueItem(QueueItemTypes.UPSERT, prepared_item.serialize()))
hook_notification_item = \
HookNotificationItem(HookNotificationItemTypes.UPSERT, prepared_item.serialize())
self._hook.notify(hook_notification_item)
except ValueError as e:
logger.warning(
"Bad PUT request on %r: %s", path, e, exc_info=True)