mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-04 21:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1654 from pbiering/set-prodid-on-collection-upload

Browse source 
Set prodid on collection upload
This commit is contained in:
Peter Bieringer 2024-12-15 07:43:49 +00:00 • committed by GitHub
commit b7ae6b378b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -14,6 +14,7 @@
* Improve: auth.ldap config shown on startup, terminate in case no password is supplied for bind user * Improve: auth.ldap config shown on startup, terminate in case no password is supplied for bind user
* Add: option [auth] uc_username for uppercase conversion (similar to existing lc_username) * Add: option [auth] uc_username for uppercase conversion (similar to existing lc_username)
* Add: option [debug] storage_cache_action for conditional logging * Add: option [debug] storage_cache_action for conditional logging
* Fix: set PRODID on collection upload (instead of vobject is inserting default one)
## 3.3.1 ## 3.3.1

9
radicale/app/put.py
View file

@ -2,7 +2,8 @@
# Copyright © 2008 Nicolas Kandel # Copyright © 2008 Nicolas Kandel
# Copyright © 2008 Pascal Halter # Copyright © 2008 Pascal Halter
# Copyright © 2008-2017 Guillaume Ayoub # Copyright © 2008-2017 Guillaume Ayoub
# Copyright © 2017-2018 Unrud <unrud@outlook.com> # Copyright © 2017-2020 Unrud <unrud@outlook.com>
# Copyright © 2020-2023 Tuna Celik <tuna@jakpark.com>
# Copyright © 2024-2024 Peter Bieringer <pb@bieringer.de> # Copyright © 2024-2024 Peter Bieringer <pb@bieringer.de>
# #
# This library is free software: you can redistribute it and/or modify # This library is free software: you can redistribute it and/or modify
@ -29,7 +30,8 @@ from typing import Iterator, List, Mapping, MutableMapping, Optional, Tuple
import vobject import vobject
import radicale.item as radicale_item import radicale.item as radicale_item
from radicale import httputils, pathutils, rights, storage, types, xmlutils from radicale import (httputils, pathutils, rights, storage, types, utils,
xmlutils)
from radicale.app.base import Access, ApplicationBase from radicale.app.base import Access, ApplicationBase
from radicale.hook import HookNotificationItem, HookNotificationItemTypes from radicale.hook import HookNotificationItem, HookNotificationItemTypes
from radicale.log import logger from radicale.log import logger
@ -37,6 +39,8 @@ from radicale.log import logger
MIMETYPE_TAGS: Mapping[str, str] = {value: key for key, value in MIMETYPE_TAGS: Mapping[str, str] = {value: key for key, value in
xmlutils.MIMETYPES.items()} xmlutils.MIMETYPES.items()}
PRODID = u"-//Radicale//NONSGML Version " + utils.package_version("radicale") + "//EN"
def prepare(vobject_items: List[vobject.base.Component], path: str, def prepare(vobject_items: List[vobject.base.Component], path: str,
content_type: str, permission: bool, parent_permission: bool, content_type: str, permission: bool, parent_permission: bool,
@ -80,6 +84,7 @@ def prepare(vobject_items: List[vobject.base.Component], path: str,
vobject_collection = vobject.iCalendar() vobject_collection = vobject.iCalendar()
for component in components: for component in components:
vobject_collection.add(component) vobject_collection.add(component)
vobject_collection.add(vobject.base.ContentLine("PRODID", [], PRODID))
item = radicale_item.Item(collection_path=collection_path, item = radicale_item.Item(collection_path=collection_path,
vobject_item=vobject_collection) vobject_item=vobject_collection)
item.prepare() item.prepare()