[CalendarServer-changes] [1564] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 1564
          http://trac.macosforge.org/projects/calendarserver/changeset/1564
Author:   wsanchez at apple.com
Date:     2007-05-23 13:40:39 -0700 (Wed, 23 May 2007)

Log Message:
-----------
Define updateCTag() so we don't have several copies of the same code everywhere.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/method/delete.py
    CalendarServer/trunk/twistedcaldav/method/put_common.py
    CalendarServer/trunk/twistedcaldav/static.py

Modified: CalendarServer/trunk/twistedcaldav/method/delete.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete.py	2007-05-23 20:17:48 UTC (rev 1563)
+++ CalendarServer/trunk/twistedcaldav/method/delete.py	2007-05-23 20:40:39 UTC (rev 1564)
@@ -22,12 +22,9 @@
 
 __all__ = ["http_DELETE"]
 
-import datetime
-
 from twisted.web2 import responsecode
 from twisted.web2.dav.util import parentForURL
 
-from twistedcaldav import customxml
 from twistedcaldav.resource import isPseudoCalendarCollectionResource
 
 def http_DELETE(self, request):
@@ -43,7 +40,7 @@
                     index.deleteResource(self.fp.basename())
                     
                     # Change CTag on the parent calendar collection
-                    parent.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+                    parent.updateCTag()
 
             return response
 

Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_common.py	2007-05-23 20:17:48 UTC (rev 1563)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py	2007-05-23 20:40:39 UTC (rev 1564)
@@ -22,8 +22,6 @@
 
 __all__ = ["storeCalendarObjectResource"]
 
-import datetime
-
 from twisted.internet.defer import deferredGenerator
 from twisted.internet.defer import maybeDeferred
 from twisted.internet.defer import waitForDeferred
@@ -46,7 +44,6 @@
 from twistedcaldav.caldavxml import NoUIDConflict
 from twistedcaldav.caldavxml import NumberOfRecurrencesWithinLimits
 from twistedcaldav.caldavxml import caldav_namespace
-from twistedcaldav import customxml
 from twistedcaldav.ical import Component
 from twistedcaldav.instance import TooManyInstancesError
 from twistedcaldav.resource import CalDAVResource
@@ -534,7 +531,7 @@
 
             if sourcecal:
                 # Change CTag on the parent calendar collection
-                sourceparent.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+                sourceparent.updateCTag()
 
         if destinationcal:
             result = doDestinationIndex(calendar)
@@ -560,7 +557,7 @@
 
         if destinationcal:
             # Change CTag on the parent calendar collection
-            destinationparent.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+            destinationparent.updateCTag()
 
         # Can now commit changes and forget the rollback details
         rollback.Commit()
@@ -582,4 +579,4 @@
         rollback.Rollback()
         raise
 
-storeCalendarObjectResource = deferredGenerator(storeCalendarObjectResource)
\ No newline at end of file
+storeCalendarObjectResource = deferredGenerator(storeCalendarObjectResource)

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2007-05-23 20:17:48 UTC (rev 1563)
+++ CalendarServer/trunk/twistedcaldav/static.py	2007-05-23 20:40:39 UTC (rev 1564)
@@ -132,7 +132,7 @@
                 raise HTTPError(status)
     
             # Initialize CTag on the calendar collection
-            self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+            self.updateCTag()
             
             # Create the index so its ready when the first PUTs come in
             self.index().create()
@@ -281,6 +281,10 @@
             if child != db_basename
         ]
 
+    def updateCTag(self):
+        assert self.isCollection()
+        self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+
     ##
     # Quota
     ##
@@ -579,7 +583,7 @@
                 self.writeDeadProperty(customxml.TwistedScheduleAutoRespond())
 
             # Initialize CTag on the calendar collection
-            self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+            self.updateCTag()
 
         return super(ScheduleInboxFile, self).provision()
 
@@ -597,7 +601,7 @@
     def provision(self):
         if self.provisionFile():
             # Initialize CTag on the calendar collection
-            self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
+            self.updateCTag()
 
         return super(ScheduleOutboxFile, self).provision()
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070523/6ef00280/attachment.html