[CalendarServer-changes] [12473] CalendarServer/trunk/txdav

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:17:24 PDT 2014


Revision: 12473
          http://trac.calendarserver.org//changeset/12473
Author:   wsanchez at apple.com
Date:     2014-01-29 19:41:32 -0800 (Wed, 29 Jan 2014)
Log Message:
-----------
Start calendar & contacts directory support.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/__init__.py

Added Paths:
-----------
    CalendarServer/trunk/txdav/who/
    CalendarServer/trunk/txdav/who/__init__.py
    CalendarServer/trunk/txdav/who/idirectory.py
    CalendarServer/trunk/txdav/who/xml.py

Modified: CalendarServer/trunk/txdav/__init__.py
===================================================================
--- CalendarServer/trunk/txdav/__init__.py	2014-01-30 02:38:31 UTC (rev 12472)
+++ CalendarServer/trunk/txdav/__init__.py	2014-01-30 03:41:32 UTC (rev 12473)
@@ -16,5 +16,13 @@
 ##
 
 """
-WebDAV support for Twisted.
+Calendar & contacts data store.
 """
+
+#
+# FIXME: 'txdav' should be renamed to 'datastore' and shoul not be
+# WebDAV-specific.
+#
+# (That means txdav.xml should be pulled out, for example, as that is
+# WebDAV-specific.)
+#

Added: CalendarServer/trunk/txdav/who/__init__.py
===================================================================
--- CalendarServer/trunk/txdav/who/__init__.py	                        (rev 0)
+++ CalendarServer/trunk/txdav/who/__init__.py	2014-01-30 03:41:32 UTC (rev 12473)
@@ -0,0 +1,20 @@
+# -*- test-case-name: txdav.who -*-
+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Calendar and contacts directory extentions to L{twext.who}.
+"""

Added: CalendarServer/trunk/txdav/who/idirectory.py
===================================================================
--- CalendarServer/trunk/txdav/who/idirectory.py	                        (rev 0)
+++ CalendarServer/trunk/txdav/who/idirectory.py	2014-01-30 03:41:32 UTC (rev 12473)
@@ -0,0 +1,145 @@
+# -*- test-case-name: txdav.who.test -*-
+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Calendar and contacts directory extentions to L{twext.who.idirectory}.
+"""
+
+__all__ = [
+]
+
+from twisted.python.constants import Names, NamedConstant
+
+from twext.who.idirectory import FieldName as BaseFieldName
+
+
+
+#
+# Data types
+#
+
+class RecordType(Names):
+    """
+    Constants for calendar and contacts directory record types.
+
+    @cvar location: Location record.
+        Represents a schedulable location (eg. a meeting room).
+
+    @cvar resource: Resource record.
+        Represents a schedulable resource (eg. a projector, conference line,
+        etc.).
+
+    @cvar address: Address record.
+        Represents a physical address (street address and/or geolocation).
+    """
+
+    location = NamedConstant()
+    location.description  = u"location"
+
+    resource = NamedConstant()
+    resource.description = u"resource"
+
+    address = NamedConstant()
+    address.description = u"physical address"
+
+
+
+class FieldName(Names):
+    """
+    Constants for calendar and contacts directory record field names.
+
+    Fields as associated with either a single value or an iterable of values.
+
+    @cvar serviceNodeUID: For a calendar and contacts service with multiple
+        nodes, this denotes the node that the user's data resides on.
+        The associated value must be a L{unicode}.
+
+    @cvar loginAllowed: Determines whether a record can log in.
+        The associated value must be a L{bool}.
+
+    @cvar hasCalendars: Determines whether a record has calendar data.
+        The associated value must be a L{bool}.
+
+    @cvar hasContacts: Determines whether a record has contact data.
+        The associated value must be a L{bool}.
+
+    @cvar autoScheduleMode: Determines the auto-schedule mode for a record.
+        The associated value must be a L{NamedConstant}.
+
+    @cvar autoAcceptGroup: Contains the UID for a group record which contains
+        members for whom auto-accept will behave as "accept if free", even if
+        auto-accept is set to "manual".
+        The associated value must be a L{NamedConstant}.
+    """
+
+    serviceNodeUID = NamedConstant()
+    serviceNodeUID.description = u"service node UID"
+
+    loginAllowed = NamedConstant()
+    loginAllowed.description = u"login permitted"
+    loginAllowed.valueType = bool
+
+    hasCalendars = NamedConstant()
+    hasCalendars.description = u"has calendars"
+    hasCalendars.valueType = bool
+
+    hasContacts = NamedConstant()
+    hasContacts.description = u"has contacts"
+    hasCalendars.valueType = bool
+
+    autoScheduleMode = NamedConstant()
+    autoScheduleMode.description = u"auto-schedule mode"
+    autoScheduleMode.valueType = NamedConstant
+
+    autoAcceptGroup = NamedConstant()
+    autoAcceptGroup.description = u"auto-accept group"
+    autoAcceptGroup.valueType = BaseFieldName.valueType(BaseFieldName.uid)
+
+
+
+class AutoScheduleMode(Names):
+    """
+    Constants for automatic scheduling modes.
+
+    @cvar accept: Accept all invitations.
+
+    @cvar decline: Decline all invitations.
+
+    @cvar acceptIfFree: Accept invitations that do not conflict with a busy
+        time slot.  Other invitations are left to be handled manually.
+
+    @cvar declineIfBusy: Decline invitations that conflict with a busy time
+        slot.  Other invitations are left to be handled manually.
+    """
+
+    # default -> ?
+
+    # none -> ?
+
+    accept = NamedConstant()
+    accept.description = u"accept"
+
+    decline = NamedConstant()
+    decline.description = u"decline"
+
+    acceptIfFree = NamedConstant()
+    acceptIfFree.description = u"accept if free"
+
+    declineIfBusy = NamedConstant()
+    declineIfBusy.description = u"decline if busy"
+
+    # automatic -> ?

Added: CalendarServer/trunk/txdav/who/xml.py
===================================================================
--- CalendarServer/trunk/txdav/who/xml.py	                        (rev 0)
+++ CalendarServer/trunk/txdav/who/xml.py	2014-01-30 03:41:32 UTC (rev 12473)
@@ -0,0 +1,127 @@
+# -*- test-case-name: txdav.who -*-
+##
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from __future__ import print_function
+from __future__ import absolute_import
+
+"""
+Calendar and contacts directory extentions to L{twext.who.xml}.
+"""
+
+__all__ = [
+    "DirectoryService",
+]
+
+from twisted.python.constants import Values, ValueConstant
+
+from twext.who.xml import DirectoryService as BaseDirectoryService
+from twext.who.util import ConstantsContainer
+
+from .idirectory import RecordType, FieldName
+
+
+
+#
+# Directory Service
+#
+
+class DirectoryService(BaseDirectoryService):
+    """
+    XML directory service with calendar and contacts attributes.
+    """
+
+    recordType = ConstantsContainer(
+        (BaseDirectoryService.recordType, RecordType)
+    )
+
+    fieldName = ConstantsContainer(
+        (BaseDirectoryService.fieldName, FieldName)
+    )
+
+
+
+#
+# XML constants
+#
+
+class Element(Values):
+    """
+    XML calendar and contacts element names.
+    """
+
+    # Field names
+
+    serviceNodeUID = ValueConstant(u"service-node")
+    serviceNodeUID.fieldName = FieldName.serviceNodeUID
+
+    loginAllowed = ValueConstant(u"login-allowed")
+    loginAllowed.fieldName = FieldName.loginAllowed
+
+    hasCalendars = ValueConstant(u"has-calendars")
+    hasCalendars.fieldName = FieldName.hasCalendars
+
+    hasContacts = ValueConstant(u"has-contacts")
+    hasContacts.fieldName = FieldName.hasContacts
+
+    autoScheduleMode = ValueConstant(u"auto-schedule-mode")
+    autoScheduleMode.fieldName = FieldName.autoScheduleMode
+
+    autoAcceptGroup = ValueConstant(u"auto-accept-group")
+    autoAcceptGroup.fieldName = FieldName.autoAcceptGroup
+
+
+
+class Attribute(Values):
+    """
+    XML calendar and contacts attribute names.
+    """
+
+
+
+class RecordTypeValue(Values):
+    """
+    XML attribute values for calendar and contacts record types.
+    """
+
+    location = ValueConstant(u"location")
+    location.fieldName = FieldName.location
+
+    resource = ValueConstant(u"resource")
+    resource.fieldName = FieldName.resource
+
+    address = ValueConstant(u"address")
+    address.fieldName = FieldName.address
+
+
+
+class AutoScheduleValue(Values):
+    """
+    XML attribute values for auto-schedule modes.
+    """
+    # default -> ?
+
+    # none -> ?
+
+    accept = ValueConstant(u"accept")
+
+    decline = ValueConstant(u"decline")
+
+    acceptIfFree = ValueConstant(u"accept-if-free")
+
+    declineIfBusy = ValueConstant(u"decline-if-busy")
+
+    # automatic -> ?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/b3b8ca29/attachment.html>


More information about the calendarserver-changes mailing list