December 2006 - calendarserver-changes

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

19 Dec '06

Revision: 851 http://trac.macosforge.org/projects/calendarserver/changeset/851 Author: wsanchez(a)apple.com Date: 2006-12-18 17:52:44 -0800 (Mon, 18 Dec 2006) Log Message: ----------- Do put children in __init__() Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-19 01:20:21 UTC (rev 850) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-19 01:52:44 UTC (rev 851) @@ -58,12 +58,9 @@ # FIXME: Smells like a hack directory.calendarHomesCollection = self - def provision(self): - if not self.putChildren: - # Create children - for recordType in self.directory.recordTypes(): - self.putChild(recordType, self.provisionChild(recordType)) - return super(DirectoryCalendarHomeProvisioningResource, self).provision() + # Create children + for recordType in self.directory.recordTypes(): + self.putChild(recordType, self.provisionChild(recordType)) def provisionChild(self, recordType): raise NotImplementedError("Subclass must implement provisionChild()")

1 0

[850] CalendarServer/trunk/testcaldav
by source_changes＠macosforge.org 19 Dec '06

19 Dec '06

Revision: 850 http://trac.macosforge.org/projects/calendarserver/changeset/850 Author: wsanchez(a)apple.com Date: 2006-12-18 17:20:21 -0800 (Mon, 18 Dec 2006) Log Message: ----------- Take args Modified Paths: -------------- CalendarServer/trunk/testcaldav Modified: CalendarServer/trunk/testcaldav =================================================================== --- CalendarServer/trunk/testcaldav 2006-12-19 01:19:33 UTC (rev 849) +++ CalendarServer/trunk/testcaldav 2006-12-19 01:20:21 UTC (rev 850) @@ -31,31 +31,33 @@ usage () { - program="$(basename "$0")"; - echo "Usage: ${program} [-v] [-d docroot] [-s serverinfo]"; - echo "Options:"; - echo " -h Print this help and exit"; - echo " -d Set the document root"; - echo " -s Set the serverinfo.xml"; - echo " -v Verbose."; + program="$(basename "$0")"; + echo "Usage: ${program} [-v] [-d docroot] [-s serverinfo]"; + echo "Options:"; + echo " -h Print this help and exit"; + echo " -d Set the document root"; + echo " -s Set the serverinfo.xml"; + echo " -v Verbose."; - if [ "${1-}" == "-" ]; then return 0; fi; - exit 64; + if [ "${1-}" == "-" ]; then return 0; fi; + exit 64; } while getopts 'hvd:s:' option; do - case "$option" in - '?') usage; ;; - 'h') usage -; exit 0; ;; - 'd') documentroot="${OPTARG}"; ;; - 's') serverinfo="${OPTARG}"; ;; - 'v') verbose="v"; ;; - esac; + case "$option" in + '?') usage; ;; + 'h') usage -; exit 0; ;; + 'd') documentroot="${OPTARG}"; ;; + 's') serverinfo="${OPTARG}"; ;; + 'v') verbose="v"; ;; + esac; done; shift $((${OPTIND} - 1)); -if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi; +if [ $# == 0 ]; then + set - "--all"; +fi; ## # Do The Right Thing @@ -71,4 +73,4 @@ cd "${documentroot}" && python "makelargecalendars.py"; -cd "${cdt}" && python testcaldav.py -s "${serverinfo}" --all; +cd "${cdt}" && python testcaldav.py -s "${serverinfo}" "$@";

1 0

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

19 Dec '06

Revision: 849 http://trac.macosforge.org/projects/calendarserver/changeset/849 Author: wsanchez(a)apple.com Date: 2006-12-18 17:19:33 -0800 (Mon, 18 Dec 2006) Log Message: ----------- Return the provisioned child, not some deferred. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 04:29:28 UTC (rev 848) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-19 01:19:33 UTC (rev 849) @@ -423,7 +423,11 @@ def provisionChild(self, name): child = CalendarHomeFile(self.fp.child(name).path, self, self.directory.recordWithShortName(self.recordType, name)) if not child.exists(): - return child.provisionDefaultCalendars() + # NOTE: provisionDefaultCalendars() returns a deferred, which we are ignoring. + # The result being that the default calendars will be present at some point + # in the future, not necessarily right now, and we don't have a way to wait + # on that to finish. + child.provisionDefaultCalendars() return child def createSimilarFile(self, path):

1 0

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

16 Dec '06

Revision: 848 http://trac.macosforge.org/projects/calendarserver/changeset/848 Author: wsanchez(a)apple.com Date: 2006-12-15 20:29:28 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Docs Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/resource.py Modified: CalendarServer/trunk/twistedcaldav/directory/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/resource.py 2006-12-16 04:22:41 UTC (rev 847) +++ CalendarServer/trunk/twistedcaldav/directory/resource.py 2006-12-16 04:29:28 UTC (rev 848) @@ -31,11 +31,8 @@ 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. + must be set up before the resource can be accessed normally. Specifically, + this must 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). @@ -44,7 +41,16 @@ return None def provisionChild(self, name): - pass + """ + Creates the child object with the given name. + This is basically akin to L{File.createSimilarFile}, but here we know we're + creating a child of this resource, and take take certain actions to ensure that + it's prepared appropriately. + @param name: the name of the child resource. + @return: the newly created (optionally deferred) child, or None of no resource + is bound as a child of this resource with the given C{name}. + """ + return None def locateChild(self, request, segments): """

1 0

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

16 Dec '06

Revision: 847 http://trac.macosforge.org/projects/calendarserver/changeset/847 Author: wsanchez(a)apple.com Date: 2006-12-15 20:22:41 -0800 (Fri, 15 Dec 2006) Log Message: ----------- locateChild() now calls provisionChild() if appropriate. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/resource.py Modified: CalendarServer/trunk/twistedcaldav/directory/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/resource.py 2006-12-16 04:21:40 UTC (rev 846) +++ CalendarServer/trunk/twistedcaldav/directory/resource.py 2006-12-16 04:22:41 UTC (rev 847) @@ -22,6 +22,8 @@ __all__ = ["AutoProvisioningResourceMixIn"] +from twisted.internet.defer import succeed, maybeDeferred + class AutoProvisioningResourceMixIn (object): """ Adds auto-provisioning to a Resource implementation. @@ -41,15 +43,19 @@ """ return None - def locateChild(self, *args): + def provisionChild(self, name): + pass + + def locateChild(self, request, segments): """ 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) + name = segments[0] + if name == "": + d = succeed(None) else: - d.addCallback(lambda _: super_method(*args)) - return d + d = maybeDeferred(self.provisionChild, name) + d.addCallback(lambda _: self.provision()) + d.addCallback(lambda _: super(AutoProvisioningResourceMixIn, self).locateChild(request, segments)) + return d

1 0

[846] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 16 Dec '06

16 Dec '06

Revision: 846 http://trac.macosforge.org/projects/calendarserver/changeset/846 Author: wsanchez(a)apple.com Date: 2006-12-15 20:21:40 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Make all implementations of provisionChild() take a name argument. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-16 03:48:58 UTC (rev 845) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-16 04:21:40 UTC (rev 846) @@ -26,7 +26,6 @@ "DirectoryCalendarHomeResource", ] -from twisted.internet.defer import succeed from twisted.web2.dav import davxml from twisted.web2.dav.util import joinURL from twisted.web2.dav.resource import TwistedACLInheritable, TwistedQuotaRootProperty @@ -138,7 +137,7 @@ assert name is None name = record.shortName - return self.provisionChild(record) + return self.provisionChild(name) def listChildren(self): return (record.shortName for record in self.directory.listRecords(self.recordType)) Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 03:48:58 UTC (rev 845) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 04:21:40 UTC (rev 846) @@ -400,8 +400,8 @@ DAVFile.__init__(self, path) DirectoryCalendarHomeProvisioningResource.__init__(self, directory, url) - def provisionChild(self, recordType): - return CalendarHomeTypeProvisioningFile(self.fp.child(recordType).path, self, recordType) + def provisionChild(self, name): + return CalendarHomeTypeProvisioningFile(self.fp.child(name).path, self, name) def createSimilarFile(self, path): raise HTTPError(responsecode.NOT_FOUND) @@ -420,8 +420,8 @@ DAVFile.__init__(self, path) DirectoryCalendarHomeTypeProvisioningResource.__init__(self, parent, recordType) - def provisionChild(self, record): - child = CalendarHomeFile(self.fp.child(record.shortName).path, self, record) + def provisionChild(self, name): + child = CalendarHomeFile(self.fp.child(name).path, self, self.directory.recordWithShortName(self.recordType, name)) if not child.exists(): return child.provisionDefaultCalendars() return child

1 0

[845] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 16 Dec '06

16 Dec '06

Revision: 845 http://trac.macosforge.org/projects/calendarserver/changeset/845 Author: wsanchez(a)apple.com Date: 2006-12-15 19:48:58 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Call provisionDefaultCalendars() from parent for now Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-16 03:20:11 UTC (rev 844) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-16 03:48:58 UTC (rev 845) @@ -192,23 +192,14 @@ assert isinstance(child, cls), "Child %r is not a %s: %r" % (name, cls.__name__, child) self.putChild(name, child) - def provision(self): - # FIXME: Make sure we don't do this more than once. - d = self.provisionDefaultCalendars() - d.addCallback(lambda _: super(DirectoryCalendarHomeResource, self).provision()) - return d - def provisionDefaultCalendars(self): - # Create a calendar collection + self.provision() childName = "calendar" childURL = joinURL(self.url(), childName) child = self.provisionChild(childName) assert isinstance(child, CalDAVResource), "Child %r is not a %s: %r" % (childName, CalDAVResource.__name__, child) - if child.exists(): - return succeed(None) - def setupChild(_): # Grant read-free-busy access to authenticated users child.setAccessControlList( @@ -230,6 +221,8 @@ inbox.provision() inbox.writeDeadProperty(caldavxml.CalendarFreeBusySet(davxml.HRef(childURL))) + return self + d = child.createCalendarCollection() d.addCallback(setupChild) return d Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 03:20:11 UTC (rev 844) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 03:48:58 UTC (rev 845) @@ -421,7 +421,10 @@ DirectoryCalendarHomeTypeProvisioningResource.__init__(self, parent, recordType) def provisionChild(self, record): - return CalendarHomeFile(self.fp.child(record.shortName).path, self, record) + child = CalendarHomeFile(self.fp.child(record.shortName).path, self, record) + if not child.exists(): + return child.provisionDefaultCalendars() + return child def createSimilarFile(self, path): raise HTTPError(responsecode.NOT_FOUND)

1 0

[844] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 16 Dec '06

16 Dec '06

Revision: 844 http://trac.macosforge.org/projects/calendarserver/changeset/844 Author: wsanchez(a)apple.com Date: 2006-12-15 19:20:11 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Always call super's provision() Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendar.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-16 02:56:53 UTC (rev 843) +++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2006-12-16 03:20:11 UTC (rev 844) @@ -26,6 +26,7 @@ "DirectoryCalendarHomeResource", ] +from twisted.internet.defer import succeed from twisted.web2.dav import davxml from twisted.web2.dav.util import joinURL from twisted.web2.dav.resource import TwistedACLInheritable, TwistedQuotaRootProperty @@ -63,7 +64,7 @@ # Create children for recordType in self.directory.recordTypes(): self.putChild(recordType, self.provisionChild(recordType)) - return super(DirectoryCalendarHomeProvisioningResource, self).provision() + return super(DirectoryCalendarHomeProvisioningResource, self).provision() def provisionChild(self, recordType): raise NotImplementedError("Subclass must implement provisionChild()") @@ -205,6 +206,9 @@ child = self.provisionChild(childName) assert isinstance(child, CalDAVResource), "Child %r is not a %s: %r" % (childName, CalDAVResource.__name__, child) + if child.exists(): + return succeed(None) + def setupChild(_): # Grant read-free-busy access to authenticated users child.setAccessControlList( Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 02:56:53 UTC (rev 843) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-16 03:20:11 UTC (rev 844) @@ -363,8 +363,8 @@ class AutoProvisioningFileMixIn (AutoProvisioningResourceMixIn): def provision(self): - if self.provisionFile(): - return super(AutoProvisioningFileMixIn, self).provision() + self.provisionFile() + return super(AutoProvisioningFileMixIn, self).provision() def provisionFile(self): fp = self.fp @@ -519,7 +519,7 @@ # since they typically don't have someone responding for them. self.writeDeadProperty(customxml.TwistedScheduleAutoRespond()) - return super(ScheduleInboxFile, self).provision() + return super(ScheduleInboxFile, self).provision() def __repr__(self): return "<%s (calendar inbox collection): %s>" % (self.__class__.__name__, self.fp.path)

1 0

[843] CalendarServer/trunk/twistedcaldav/root.py
by source_changes＠macosforge.org 16 Dec '06

16 Dec '06

Revision: 843 http://trac.macosforge.org/projects/calendarserver/changeset/843 Author: wsanchez(a)apple.com Date: 2006-12-15 18:56:53 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Use our DAVFile Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/root.py Modified: CalendarServer/trunk/twistedcaldav/root.py =================================================================== --- CalendarServer/trunk/twistedcaldav/root.py 2006-12-15 20:41:23 UTC (rev 842) +++ CalendarServer/trunk/twistedcaldav/root.py 2006-12-16 02:56:53 UTC (rev 843) @@ -24,8 +24,8 @@ from twisted.web2.auth.wrapper import UnauthorizedResponse from twisted.web2.dav import davxml -from twisted.web2.dav.static import DAVFile +from twistedcaldav.extensions import DAVFile from twistedcaldav.config import config class RootResource(DAVFile):

1 0

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

15 Dec '06

Revision: 842 http://trac.macosforge.org/projects/calendarserver/changeset/842 Author: wsanchez(a)apple.com Date: 2006-12-15 12:41:23 -0800 (Fri, 15 Dec 2006) Log Message: ----------- Add AutoProvisioningFileMixIn. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/principal.py CalendarServer/trunk/twistedcaldav/static.py Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/principal.py 2006-12-15 20:40:58 UTC (rev 841) +++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2006-12-15 20:41:23 UTC (rev 842) @@ -39,9 +39,8 @@ from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVFile from twistedcaldav.resource import CalendarPrincipalCollectionResource, CalendarPrincipalResource -from twistedcaldav.static import provisionFile +from twistedcaldav.static import AutoProvisioningFileMixIn 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 @@ -56,7 +55,7 @@ return succeed(self.defaultAccessControlList()) class DirectoryPrincipalProvisioningResource ( - AutoProvisioningResourceMixIn, + AutoProvisioningFileMixIn, PermissionsMixIn, CalendarPrincipalCollectionResource, DAVFile, @@ -88,9 +87,6 @@ for recordType in self.directory.recordTypes(): self.putChild(recordType, DirectoryPrincipalTypeResource(self.fp.child(recordType).path, self, recordType)) - def provision(self): - provisionFile(self) - def principalForUser(self, user): return self.getChild("user").getChild(user) @@ -157,7 +153,7 @@ return (self,) class DirectoryPrincipalTypeResource ( - AutoProvisioningResourceMixIn, + AutoProvisioningFileMixIn, PermissionsMixIn, CalendarPrincipalCollectionResource, DAVFile, @@ -176,23 +172,20 @@ self.directory = parent.directory self.recordType = recordType - self._parent = parent + self.parent = parent # Provision in __init__() because principals are used prior to request # lookups. self.provision() - def provision(self): - provisionFile(self, self._parent) - def principalForUser(self, user): - return self._parent.principalForUser(user) + return self.parent.principalForUser(user) def principalForRecord(self, record): - return self._parent.principalForRecord(record) + return self.parent.principalForRecord(record) def principalForCalendarUserAddress(self, address): - return self._parent.principalForCalendarUserAddress(address) + return self.parent.principalForCalendarUserAddress(address) ## # Static @@ -224,9 +217,9 @@ ## def principalCollections(self): - return self._parent.principalCollections() + return self.parent.principalCollections() -class DirectoryPrincipalResource (PermissionsMixIn, CalendarPrincipalResource, DAVFile): +class DirectoryPrincipalResource (AutoProvisioningFileMixIn, PermissionsMixIn, CalendarPrincipalResource, DAVFile): """ Directory principal resource. """ @@ -239,16 +232,13 @@ super(DirectoryPrincipalResource, self).__init__(path, joinURL(parent.principalCollectionURL(), record.shortName)) self.record = record - self._parent = parent + 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): - provisionFile(self, self._parent, True) - ## # HTTP ## @@ -310,6 +300,9 @@ else: return self.record.shortName + def isCollection(self): + return False + ## # ACL ## @@ -335,9 +328,9 @@ for relative in getattr(record, method)(): if relative not in records: if relative.recordType == myRecordType: - relatives.add(self._parent.getChild(None, record=relative)) + relatives.add(self.parent.getChild(None, record=relative)) else: - relatives.add(self._parent._parent.getChild(relative.recordType).getChild(None, record=relative)) + relatives.add(self.parent.parent.getChild(relative.recordType).getChild(None, record=relative)) self._getRelatives(method, relative, relatives, records) return relatives @@ -349,7 +342,7 @@ return self._getRelatives("groups") def principalCollections(self): - return self._parent.principalCollections() + return self.parent.principalCollections() ## # CalDAV Modified: CalendarServer/trunk/twistedcaldav/static.py =================================================================== --- CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 20:40:58 UTC (rev 841) +++ CalendarServer/trunk/twistedcaldav/static.py 2006-12-15 20:41:23 UTC (rev 842) @@ -361,7 +361,33 @@ _checkParents = deferredGenerator(_checkParents) -class CalendarHomeProvisioningFile (DirectoryCalendarHomeProvisioningResource, DAVFile): +class AutoProvisioningFileMixIn (AutoProvisioningResourceMixIn): + def provision(self): + if self.provisionFile(): + return super(AutoProvisioningFileMixIn, self).provision() + + def provisionFile(self): + fp = self.fp + + fp.restat(False) + if fp.exists(): + return False + + if hasattr(self, "parent"): + parent = self.parent + assert parent.exists() + assert parent.isCollection() + + if self.isCollection(): + fp.makedirs() + fp.restat(False) + else: + fp.open("w").close() + fp.restat(False) + + return True + +class CalendarHomeProvisioningFile (AutoProvisioningFileMixIn, DirectoryCalendarHomeProvisioningResource, DAVFile): """ Resource which provisions calendar home collections as needed. """ @@ -374,18 +400,13 @@ DAVFile.__init__(self, path) DirectoryCalendarHomeProvisioningResource.__init__(self, directory, url) - def provision(self): - provisionFile(self) - - super(CalendarHomeProvisioningFile, self).provision() - def provisionChild(self, recordType): return CalendarHomeTypeProvisioningFile(self.fp.child(recordType).path, self, recordType) def createSimilarFile(self, path): raise HTTPError(responsecode.NOT_FOUND) -class CalendarHomeTypeProvisioningFile (DirectoryCalendarHomeTypeProvisioningResource, DAVFile): +class CalendarHomeTypeProvisioningFile (AutoProvisioningFileMixIn, DirectoryCalendarHomeTypeProvisioningResource, DAVFile): """ Resource which provisions calendar home collections of a specific record type as needed. @@ -399,18 +420,13 @@ DAVFile.__init__(self, path) DirectoryCalendarHomeTypeProvisioningResource.__init__(self, parent, recordType) - def provision(self): - provisionFile(self, self._parent) - - return super(CalendarHomeTypeProvisioningFile, self).provision() - def provisionChild(self, record): return CalendarHomeFile(self.fp.child(record.shortName).path, self, record) def createSimilarFile(self, path): raise HTTPError(responsecode.NOT_FOUND) -class CalendarHomeFile (DirectoryCalendarHomeResource, CalDAVFile): +class CalendarHomeFile (AutoProvisioningFileMixIn, DirectoryCalendarHomeResource, CalDAVFile): """ Calendar home collection resource. """ @@ -421,12 +437,6 @@ CalDAVFile.__init__(self, path) DirectoryCalendarHomeResource.__init__(self, parent, record) - def provision(self): - if not provisionFile(self, self._parent): - return succeed(None) - - return super(CalendarHomeFile, self).provision() - def provisionChild(self, name): if config.DropBoxEnabled: DropBoxHomeFileClass = DropBoxHomeFile @@ -460,13 +470,13 @@ return super(CalendarHomeFile, self).getChild(name) -class ScheduleFile (AutoProvisioningResourceMixIn, CalDAVFile): +class ScheduleFile (AutoProvisioningFileMixIn, CalDAVFile): def __init__(self, path, parent): super(ScheduleFile, self).__init__(path, principalCollections=parent.principalCollections()) - self._parent = parent + self.parent = parent - def provision(self): - provisionFile(self, self._parent) + def isCollection(self): + return True def createSimilarFile(self, path): if path == self.fp.path: @@ -501,14 +511,16 @@ Calendar scheduling inbox collection resource. """ def provision(self): - if provisionFile(self, self._parent): + if self.provisionFile(): # FIXME: This should probably be a directory record option that # maps to the property value directly without the need to store one. - if self._parent.record.recordType == "resource": + if self.parent.record.recordType == "resource": # Resources should have autorespond turned on by default, # since they typically don't have someone responding for them. self.writeDeadProperty(customxml.TwistedScheduleAutoRespond()) + return super(ScheduleInboxFile, self).provision() + def __repr__(self): return "<%s (calendar inbox collection): %s>" % (self.__class__.__name__, self.fp.path) @@ -519,15 +531,12 @@ def __repr__(self): return "<%s (calendar outbox collection): %s>" % (self.__class__.__name__, self.fp.path) -class DropBoxHomeFile (AutoProvisioningResourceMixIn, DropBoxHomeResource, CalDAVFile): +class DropBoxHomeFile (AutoProvisioningFileMixIn, DropBoxHomeResource, CalDAVFile): def __init__(self, path, parent): DropBoxHomeResource.__init__(self) CalDAVFile.__init__(self, path, principalCollections=parent.principalCollections()) - self._parent = parent + self.parent = parent - def provision(self): - provisionFile(self, self._parent) - def createSimilarFile(self, path): if path == self.fp.path: return self @@ -572,26 +581,6 @@ # Utilities ## -def provisionFile(resource, parent=None, isFile=False): - fp = resource.fp - - fp.restat(False) - if fp.exists(): - return False - - if parent is not None: - assert parent.exists() - assert parent.isCollection() - - if isFile: - fp.open("w").close() - fp.restat(False) - else: - fp.makedirs() - fp.restat(False) - - return True - def locateExistingChild(resource, request, segments): """ This C{locateChild()} implementation fails to find children if C{getChild()}

1 0