December 2006 - calendarserver-changes

[841] CalendarServer/trunk/twistedcaldav/directory/calendar.py
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 841 http://trac.macosforge.org/projects/calendarserver/changeset/841 Author: wsanchez(a)apple.com Date: 2006-12-15 12:40:58 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Call super as needed Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 19:53:12 UTC (rev 840) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 20:40:58 UTC (rev 841) @@ -63,6 +63,7 @@ # Create children for recordType in self.directory.recordTypes(): self.putChild(recordType, self.provisionChild(recordType)) + return super(DirectoryCalendarHomeProvisioningResource, self).provision() def provisionChild(self, recordType): raise NotImplementedError("Subclass must implement provisionChild()") @@ -192,7 +193,9 @@ def provision(self): # FIXME: Make sure we don't do this more than once. - return self.provisionDefaultCalendars() + d = self.provisionDefaultCalendars() + d.addCallback(lambda _: super(DirectoryCalendarHomeResource, self).provision()) + return d def provisionDefaultCalendars(self): # Create a calendar collection

1 0

[840] CalendarServer/trunk/twistedcaldav/directory/resource.py
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 840 http://trac.macosforge.org/projects/calendarserver/changeset/840 Author: wsanchez(a)apple.com Date: 2006-12-15 11:53:12 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Don't forget resource.py Added Paths: ----------- CalendarServer/trunk/twistedcaldav/directory/resource.py Added: CalendarServer/trunk/twistedcaldav/directory/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/resource.py (rev 0) +++ CalendarServer/trunk/twistedcaldav/directory/resource.py 2006-12-15 19:53:12 UTC (rev 840) @@ -0,0 +1,55 @@ +## +# Copyright (c) 2006 Apple Computer, 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. +# +# DRI: Wilfredo Sanchez, wsanchez(a)apple.com +## + +""" +Implements a directory-backed principal hierarchy. +""" + +__all__ = ["AutoProvisioningResourceMixIn"] + +class AutoProvisioningResourceMixIn (object): + """ + Adds auto-provisioning to a Resource implementation. + """ + def provision(self): + """ + Provision this resource by creating any required backing store, etc. that + must be set up before the resource can be accessed normally. + FIXME: More description of what that means would be helpful here. Basically, + RenderMixIn methods should work (perhaps returning None) without having to + call this first, so that dirlist can happen, but it is expected that this will + have been called before anything that involves I/O happens. + This method may be called multiple times; provisioning code should ensure that + it handles this properly, typically by returning immediately if the resource is + already provisioned (eg. the backing store exists). + @return: a deferred or None. + """ + return None + + def locateChild(self, *args): + """ + This implementation calls L{provision}, then super's L{locateChild}, thereby + ensuring that looked-up resources are provisioned. + """ + super_method = super(AutoProvisioningResourceMixIn, self).locateChild + d = self.provision() + if d is None: + return super_method(*args) + else: + d.addCallback(lambda _: super_method(*args)) + return d

1 0

[839] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 839 http://trac.macosforge.org/projects/calendarserver/changeset/839 Author: wsanchez(a)apple.com Date: 2006-12-15 11:37:11 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Add AutoProvisioningResourceMixIn Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py CalendarServer/trunk/twistedcaldav/directory/principal.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 18:58:52 UTC (rev 838) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 19:37:11 UTC (rev 839) @@ -37,8 +37,9 @@ from twistedcaldav.resource import CalDAVResource from twistedcaldav.schedule import ScheduleInboxResource, ScheduleOutboxResource from twistedcaldav.directory.idirectory import IDirectoryService +from twistedcaldav.directory.resource import AutoProvisioningResourceMixIn -class DirectoryCalendarHomeProvisioningResource (ReadOnlyResourceMixIn, DAVResource): +class DirectoryCalendarHomeProvisioningResource (AutoProvisioningResourceMixIn, ReadOnlyResourceMixIn, DAVResource): """ Resource which provisions calendar home collections as needed. """ @@ -70,8 +71,6 @@ return self._url def getChild(self, name): - self.provision() - return self.putChildren.get(name, None) def listChildren(self): @@ -103,7 +102,7 @@ def defaultAccessControlList(self): return readOnlyACL -class DirectoryCalendarHomeTypeProvisioningResource (ReadOnlyResourceMixIn, DAVResource): +class DirectoryCalendarHomeTypeProvisioningResource (AutoProvisioningResourceMixIn, ReadOnlyResourceMixIn, DAVResource): """ Resource which provisions calendar home collections of a specific record type as needed. @@ -120,12 +119,6 @@ self.recordType = recordType self._parent = parent - def provision(self): - pass - - def provisionChild(self, record): - raise NotImplementedError("Subclass must implement provisionChild()") - def url(self): return joinURL(self._parent.url(), self.recordType) @@ -165,7 +158,7 @@ def principalCollections(self): return self._parent.principalCollections() -class DirectoryCalendarHomeResource (CalDAVResource): +class DirectoryCalendarHomeResource (AutoProvisioningResourceMixIn, CalDAVResource): """ Calendar home collection resource. """ @@ -240,11 +233,6 @@ def url(self): return joinURL(self._parent.url(), self.record.shortName) - def locateChild(self, path, segments): - d = self.provision() - d.addCallback(lambda _: super(DirectoryCalendarHomeResource, self).locateChild(path, segments)) - return d - ## # DAV ## Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/principal.py 2006-12-15 18:58:52 UTC (rev 838) +++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2006-12-15 19:37:11 UTC (rev 839) @@ -41,6 +41,7 @@ from twistedcaldav.resource import CalendarPrincipalCollectionResource, CalendarPrincipalResource from twistedcaldav.static import provisionFile from twistedcaldav.directory.idirectory import IDirectoryService +from twistedcaldav.directory.resource import AutoProvisioningResourceMixIn # FIXME: These should not be tied to DAVFile # The reason that they is that web2.dav only implements DAV methods on @@ -54,7 +55,12 @@ # Permissions here are fixed, and are not subject to inherritance rules, etc. return succeed(self.defaultAccessControlList()) -class DirectoryPrincipalProvisioningResource (PermissionsMixIn, CalendarPrincipalCollectionResource, DAVFile): +class DirectoryPrincipalProvisioningResource ( + AutoProvisioningResourceMixIn, + PermissionsMixIn, + CalendarPrincipalCollectionResource, + DAVFile, +): """ Collection resource which provisions directory principals as its children. """ @@ -74,6 +80,8 @@ # FIXME: Smells like a hack directory.principalCollection = self + # Provision in __init__() because principals are used prior to request + # lookups. self.provision() # Create children @@ -136,7 +144,6 @@ raise HTTPError(responsecode.NOT_FOUND) def getChild(self, name): - self.provision() return self.putChildren.get(name, None) def listChildren(self): @@ -149,7 +156,12 @@ def principalCollections(self): return (self,) -class DirectoryPrincipalTypeResource (PermissionsMixIn, CalendarPrincipalCollectionResource, DAVFile): +class DirectoryPrincipalTypeResource ( + AutoProvisioningResourceMixIn, + PermissionsMixIn, + CalendarPrincipalCollectionResource, + DAVFile, +): """ Collection resource which provisions directory principals of a specific type as its children. """ @@ -166,6 +178,8 @@ self.recordType = recordType self._parent = parent + # Provision in __init__() because principals are used prior to request + # lookups. self.provision() def provision(self): @@ -189,8 +203,6 @@ raise HTTPError(responsecode.NOT_FOUND) def getChild(self, name, record=None): - self.provision() - if name == "": return self @@ -230,6 +242,8 @@ self._parent = parent self._url = joinURL(parent.principalCollectionURL(), record.shortName) + # Provision in __init__() because principals are used prior to request + # lookups. self.provision() def provision(self): Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 18:58:52 UTC (rev 838) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 19:37:11 UTC (rev 839) @@ -59,6 +59,7 @@ from twistedcaldav.directory.calendar import DirectoryCalendarHomeProvisioningResource from twistedcaldav.directory.calendar import DirectoryCalendarHomeTypeProvisioningResource from twistedcaldav.directory.calendar import DirectoryCalendarHomeResource +from twistedcaldav.directory.resource import AutoProvisioningResourceMixIn class CalDAVFile (CalDAVResource, DAVFile): """ @@ -459,22 +460,14 @@ return super(CalendarHomeFile, self).getChild(name) -class AutoProvisionCalDAVFile(CalDAVFile): - """ - A class that makes a resource auto-provision itself when someone tries to locate it. - """ - def provision(self): - provisionFile(self, self._parent) - - def locateChild(self, path, segments): - self.provision() - return super(AutoProvisionCalDAVFile, self).locateChild(path, segments) - -class ScheduleFile (AutoProvisionCalDAVFile): +class ScheduleFile (AutoProvisioningResourceMixIn, CalDAVFile): def __init__(self, path, parent): super(ScheduleFile, self).__init__(path, principalCollections=parent.principalCollections()) self._parent = parent + def provision(self): + provisionFile(self, self._parent) + def createSimilarFile(self, path): if path == self.fp.path: return self @@ -526,10 +519,10 @@ def __repr__(self): return "<%s (calendar outbox collection): %s>" % (self.__class__.__name__, self.fp.path) -class DropBoxHomeFile (DropBoxHomeResource, AutoProvisionCalDAVFile): +class DropBoxHomeFile (AutoProvisioningResourceMixIn, DropBoxHomeResource, CalDAVFile): def __init__(self, path, parent): DropBoxHomeResource.__init__(self) - AutoProvisionCalDAVFile.__init__(self, path, principalCollections=parent.principalCollections()) + CalDAVFile.__init__(self, path, principalCollections=parent.principalCollections()) self._parent = parent def provision(self):

1 0

[838] CalDAVTester/trunk/Resource/dropbox
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 838 http://trac.macosforge.org/projects/calendarserver/changeset/838 Author: cdaboo(a)apple.com Date: 2006-12-15 10:58:52 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Namespace changes. Modified Paths: -------------- CalDAVTester/trunk/Resource/dropbox/1.xml CalDAVTester/trunk/Resource/dropbox/4.xml Modified: CalDAVTester/trunk/Resource/dropbox/1.xml =================================================================== --- CalDAVTester/trunk/Resource/dropbox/1.xml 2006-12-15 18:52:06 UTC (rev 837) +++ CalDAVTester/trunk/Resource/dropbox/1.xml 2006-12-15 18:58:52 UTC (rev 838) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<D:propfind xmlns:D="DAV:" xmlns:A="http://apple.com/ns/calendarserver/"> +<D:propfind xmlns:D="DAV:" xmlns:A="http://org.calendarserver/ns/"> <D:prop> <A:dropbox-home-URL/> <A:notifications-URL/> Modified: CalDAVTester/trunk/Resource/dropbox/4.xml =================================================================== --- CalDAVTester/trunk/Resource/dropbox/4.xml 2006-12-15 18:52:06 UTC (rev 837) +++ CalDAVTester/trunk/Resource/dropbox/4.xml 2006-12-15 18:58:52 UTC (rev 838) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<D:propfind xmlns:D="DAV:" xmlns:A="http://apple.com/ns/calendarserver/"> +<D:propfind xmlns:D="DAV:" xmlns:A="http://org.calendarserver/ns/"> <D:prop> <A:time-stamp/> <A:changed/>

1 0

[837] CalDAVTester/trunk/scripts/tests
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 837 http://trac.macosforge.org/projects/calendarserver/changeset/837 Author: cdaboo(a)apple.com Date: 2006-12-15 10:52:06 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Fixes for latest dropbox/notification support. Also turn on notification test for --all. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/dropbox.xml CalDAVTester/trunk/scripts/tests/notifications.xml Modified: CalDAVTester/trunk/scripts/tests/dropbox.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/dropbox.xml 2006-12-15 16:30:34 UTC (rev 836) +++ CalDAVTester/trunk/scripts/tests/dropbox.xml 2006-12-15 18:52:06 UTC (rev 837) @@ -39,8 +39,8 @@ <callback>propfindItems</callback> <arg> <name>okprops</name> - <value>http://apple.com/ns/calendarserver/dropbox-home-URL$<href xmlns="DAV:">$pathprefix:/dropbox/</href></value> - <value>http://apple.com/ns/calendarserver/notifications-URL$<href xmlns="DAV:">$pathprefix:/notifications/</href></value> + <value>http://org.calendarserver/ns/dropbox-home-URL$<href xmlns="DAV:">$pathprefix:/dropbox/</href></value> + <value>http://org.calendarserver/ns/notifications-URL$<href xmlns="DAV:">$pathprefix:/notifications/</href></value> </arg> </verify> </request> @@ -64,7 +64,7 @@ <callback>propfindItems</callback> <arg> <name>okprops</name> - <value>DAV:resourcetype$<collection/><dropbox-home xmlns="http://apple.com/ns/calendarserver/"/></value> + <value>DAV:resourcetype$<collection/><dropbox-home xmlns="http://org.calendarserver/ns/"/></value> </arg> </verify> </request> @@ -86,7 +86,7 @@ <callback>propfindItems</callback> <arg> <name>okprops</name> - <value>DAV:resourcetype$<collection/><notifications xmlns="http://apple.com/ns/calendarserver/"/></value> + <value>DAV:resourcetype$<collection/><notifications xmlns="http://org.calendarserver/ns/"/></value> </arg> </verify> </request> @@ -124,7 +124,7 @@ <callback>propfindItems</callback> <arg> <name>okprops</name> - <value>DAV:resourcetype$<collection/><dropbox xmlns="http://apple.com/ns/calendarserver/"/></value> + <value>DAV:resourcetype$<collection/><dropbox xmlns="http://org.calendarserver/ns/"/></value> </arg> </verify> </request> @@ -223,7 +223,7 @@ </verify> </request> </test> - <test name='2'> + <test name='2' ignore="yes"> <description>Try to create a resource</description> <request end-delete="yes"> <method>PUT</method> Modified: CalDAVTester/trunk/scripts/tests/notifications.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/notifications.xml 2006-12-15 16:30:34 UTC (rev 836) +++ CalDAVTester/trunk/scripts/tests/notifications.xml 2006-12-15 18:52:06 UTC (rev 837) @@ -20,7 +20,7 @@ DRI: Cyrus Daboo, cdaboo(a)apple.com --> -<caldavtest ignore-all="yes"> +<caldavtest> <description>Test drop box notification features</description> <start> @@ -124,8 +124,8 @@ </arg> <arg> <name>okprops</name> - <value>http://apple.com/ns/calendarserver/time-stamp</value> - <value>http://apple.com/ns/calendarserver/changed$<href xmlns="DAV:">$pathprefix:/dropbox/ABC2/</href></value> + <value>http://org.calendarserver/ns/time-stamp</value> + <value>http://org.calendarserver/ns/changed$<href xmlns="DAV:">$pathprefix:/dropbox/ABC2/</href></value> </arg> </verify> </request> @@ -197,8 +197,8 @@ </arg> <arg> <name>okprops</name> - <value>http://apple.com/ns/calendarserver/time-stamp</value> - <value>http://apple.com/ns/calendarserver/changed$<href xmlns="DAV:">$pathprefix:/dropbox/ABC2/</href></value> + <value>http://org.calendarserver/ns/time-stamp</value> + <value>http://org.calendarserver/ns/changed$<href xmlns="DAV:">$pathprefix:/dropbox/ABC2/</href></value> </arg> </verify> </request>

1 0

[836] CalendarServer/trunk/twistedcaldav/static.py
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 836 http://trac.macosforge.org/projects/calendarserver/changeset/836 Author: cdaboo(a)apple.com Date: 2006-12-15 08:30:34 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Make sure dropbox auto-provisions itself. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 06:12:30 UTC (rev 835) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 16:30:34 UTC (rev 836) @@ -459,18 +459,22 @@ return super(CalendarHomeFile, self).getChild(name) -class ScheduleFile (CalDAVFile): - def __init__(self, path, parent): - super(ScheduleFile, self).__init__(path, principalCollections=parent.principalCollections()) - self._parent = parent - +class AutoProvisionCalDAVFile(CalDAVFile): + """ + A class that makes a resource auto-provision itself when someone tries to locate it. + """ def provision(self): provisionFile(self, self._parent) def locateChild(self, path, segments): self.provision() - return super(ScheduleFile, self).locateChild(path, segments) + return super(AutoProvisionCalDAVFile, self).locateChild(path, segments) +class ScheduleFile (AutoProvisionCalDAVFile): + def __init__(self, path, parent): + super(ScheduleFile, self).__init__(path, principalCollections=parent.principalCollections()) + self._parent = parent + def createSimilarFile(self, path): if path == self.fp.path: return self @@ -522,10 +526,10 @@ def __repr__(self): return "<%s (calendar outbox collection): %s>" % (self.__class__.__name__, self.fp.path) -class DropBoxHomeFile (DropBoxHomeResource, CalDAVFile): +class DropBoxHomeFile (DropBoxHomeResource, AutoProvisionCalDAVFile): def __init__(self, path, parent): DropBoxHomeResource.__init__(self) - CalDAVFile.__init__(self, path, principalCollections=parent.principalCollections()) + AutoProvisionCalDAVFile.__init__(self, path, principalCollections=parent.principalCollections()) self._parent = parent def provision(self):

1 0

[835] CalendarServer/trunk/twistedcaldav/directory/calendar.py
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 835 http://trac.macosforge.org/projects/calendarserver/changeset/835 Author: wsanchez(a)apple.com Date: 2006-12-14 22:12:30 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Do not call provision() on your children when provisioning yourself; this obviates the whole lazy-provisioning strategy. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 05:03:02 UTC (rev 834) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 06:12:30 UTC (rev 835) @@ -188,9 +188,9 @@ ("outbox", ScheduleOutboxResource), ) if config.DropBoxEnabled: - childlist = childlist + ( - ("dropbox", DropBoxHomeResource), - #("notifications": NotificationsHomeResource), + childlist += ( + ("dropbox" , DropBoxHomeResource ), + #("notifications", NotificationsHomeResource), ) for name, cls in childlist: child = self.provisionChild(name) @@ -198,20 +198,9 @@ self.putChild(name, child) def provision(self): - self.provisionSpecialCollections() + # FIXME: Make sure we don't do this more than once. return self.provisionDefaultCalendars() - def provisionSpecialCollections(self): - childlist = ("inbox" , "outbox",) - if config.DropBoxEnabled: - childlist = childlist + ( - "dropbox", - #"notifications", - ) - for child in childlist: - collection = self.getChild(child) - collection.provision() - def provisionDefaultCalendars(self): # Create a calendar collection @@ -234,6 +223,11 @@ # Set calendar-free-busy-set on inbox inbox = self.getChild("inbox") + # FIXME: Shouldn't have to call provision() on another resource + # We cheat here because while inbox will auto-provision itself when located, + # we need to write a dead property to it pre-emptively. + # Possible fix: store the free/busy set property on this resource instead. + inbox.provision() inbox.writeDeadProperty(caldavxml.CalendarFreeBusySet(davxml.HRef(childURL))) d = child.createCalendarCollection()

1 0

[834] CalendarServer/trunk/twistedcaldav/dropbox.py
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 834 http://trac.macosforge.org/projects/calendarserver/changeset/834 Author: cdaboo(a)apple.com Date: 2006-12-14 21:03:02 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Add back isCollection. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/dropbox.py Modified: CalendarServer/trunk/twistedcaldav/dropbox.py =================================================================== --- CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-15 04:48:48 UTC (rev 833) +++ CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-15 05:03:02 UTC (rev 834) @@ -54,6 +54,9 @@ def resourceType(self): return davxml.ResourceType.dropbox + def isCollection(self): + return True + def writeNewACEs(self, newaces): """ Write a new ACL to the resource's property store. We override this for calendar collections

1 0

[833] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 833 http://trac.macosforge.org/projects/calendarserver/changeset/833 Author: cdaboo(a)apple.com Date: 2006-12-14 20:48:48 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Fix up drop box support after recent changes. Note that notifications are not working right now. Also, we need to make sure the drop box properties are not advertised if drop box is disabled. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py CalendarServer/trunk/twistedcaldav/dropbox.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 03:45:52 UTC (rev 832) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-15 04:48:48 UTC (rev 833) @@ -31,6 +31,8 @@ from twisted.web2.dav.resource import TwistedACLInheritable, TwistedQuotaRootProperty from twistedcaldav import caldavxml +from twistedcaldav.config import config +from twistedcaldav.dropbox import DropBoxHomeResource from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVResource from twistedcaldav.resource import CalDAVResource from twistedcaldav.schedule import ScheduleInboxResource, ScheduleOutboxResource @@ -181,17 +183,35 @@ self._parent = parent # Cache children which must be of a specific type - for name, cls in ( + childlist = ( ("inbox" , ScheduleInboxResource ), ("outbox", ScheduleOutboxResource), - ): + ) + if config.DropBoxEnabled: + childlist = childlist + ( + ("dropbox", DropBoxHomeResource), + #("notifications": NotificationsHomeResource), + ) + for name, cls in childlist: child = self.provisionChild(name) assert isinstance(child, cls), "Child %r is not a %s: %r" % (name, cls.__name__, child) self.putChild(name, child) def provision(self): + self.provisionSpecialCollections() return self.provisionDefaultCalendars() + def provisionSpecialCollections(self): + childlist = ("inbox" , "outbox",) + if config.DropBoxEnabled: + childlist = childlist + ( + "dropbox", + #"notifications", + ) + for child in childlist: + collection = self.getChild(child) + collection.provision() + def provisionDefaultCalendars(self): # Create a calendar collection @@ -214,7 +234,6 @@ # Set calendar-free-busy-set on inbox inbox = self.getChild("inbox") - inbox.provision() inbox.writeDeadProperty(caldavxml.CalendarFreeBusySet(davxml.HRef(childURL))) d = child.createCalendarCollection() Modified: CalendarServer/trunk/twistedcaldav/dropbox.py =================================================================== --- CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-15 03:45:52 UTC (rev 832) +++ CalendarServer/trunk/twistedcaldav/dropbox.py 2006-12-15 04:48:48 UTC (rev 833) @@ -42,10 +42,7 @@ Drop box collection resource. """ def resourceType(self): - return davxml.ResourceType( - davxml.ResourceType.collection, - davxml.ResourceType.dropboxhome, - ) + return davxml.ResourceType.dropboxhome def isCollection(self): return True @@ -55,14 +52,8 @@ Drop box resource. """ def resourceType(self): - return davxml.ResourceType( - davxml.ResourceType.collection, - davxml.ResourceType.dropbox, - ) + return davxml.ResourceType.dropbox - def isCollection(self): - return True - def writeNewACEs(self, newaces): """ Write a new ACL to the resource's property store. We override this for calendar collections @@ -113,6 +104,12 @@ (calendarserver_namespace, "valid-drop-box") ) + def http_MKCALENDAR (self, request): + return ErrorResponse( + responsecode.FORBIDDEN, + (calendarserver_namespace, "valid-drop-box") + ) + def http_X_APPLE_SUBSCRIBE(self, request): d = waitForDeferred(self.authorize(request, (davxml.Read(),))) yield d @@ -171,7 +168,15 @@ class DropBoxChildResource (DAVResource): def http_MKCOL(self, request): - return responsecode.FORBIDDEN + return ErrorResponse( + responsecode.FORBIDDEN, + (calendarserver_namespace, "valid-drop-box-resource") + ) + def http_MKCALENDAR (self, request): + return ErrorResponse( + responsecode.FORBIDDEN, + (calendarserver_namespace, "valid-drop-box-resource") + ) def http_PUT(self, request): # Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 03:45:52 UTC (rev 832) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 04:48:48 UTC (rev 833) @@ -548,12 +548,18 @@ else: return DropBoxChildFile(path, self) + http_DELETE = DropBoxCollectionResource.http_DELETE + http_PUT = DropBoxCollectionResource.http_PUT + http_MKCALENDAR = DropBoxCollectionResource.http_MKCALENDAR + http_X_APPLE_SUBSCRIBE = DropBoxCollectionResource.http_X_APPLE_SUBSCRIBE + http_X_APPLE_UNSUBSCRIBE = DropBoxCollectionResource.http_X_APPLE_SUBSCRIBE + class DropBoxChildFile (DropBoxChildResource, CalDAVFile): def __init__(self, path, parent): DropBoxChildResource.__init__(self) CalDAVFile.__init__(self, path, principalCollections=parent.principalCollections()) - assert self.fp.isfile() or not self.fp.exists + assert self.fp.isfile() or not self.fp.exists() def createSimilarFile(self, path): if path == self.fp.path: @@ -561,6 +567,10 @@ else: return responsecode.NOT_FOUND + http_MKCOL = DropBoxChildResource.http_MKCOL + http_MKCALENDAR = DropBoxChildResource.http_MKCALENDAR + http_PUT = DropBoxChildResource.http_PUT + ## # Utilities ##

1 0

[832] CalendarServer/trunk/twistedcaldav/resource.py
by source_changes＠macosforge.org 15 Dec '06

15 Dec '06

Revision: 832 http://trac.macosforge.org/projects/calendarserver/changeset/832 Author: wsanchez(a)apple.com Date: 2006-12-14 19:45:52 -0800 (Thu, 14 Dec 2006) Log Message: ----------- minor, someone already beat me to it. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/resource.py Modified: CalendarServer/trunk/twistedcaldav/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/resource.py 2006-12-15 02:41:23 UTC (rev 831) +++ CalendarServer/trunk/twistedcaldav/resource.py 2006-12-15 03:45:52 UTC (rev 832) @@ -88,7 +88,7 @@ # FIXME: Add a self-link to the dirlist with a query string so # users can still download the actual iCalendar data? agent = request.headers.getHeader("user-agent") - if agent and agent.startswith("Mozilla/") and agent.find("Gecko") != -1: + if agent is not None and agent.startswith("Mozilla/") and agent.find("Gecko") != -1: html_agent = True else: html_agent = False

1 0