[CalendarServer-changes] [4530] CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup

[source_changes at macosforge.org]

Revision: 4530
          http://trac.macosforge.org/projects/calendarserver/changeset/4530
Author:   wsanchez at apple.com
Date:     2009-09-10 10:37:16 -0700 (Thu, 10 Sep 2009)
Log Message:
-----------
Update FB info for non-users

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup

Modified: CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup	2009-09-08 20:38:33 UTC (rev 4529)
+++ CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup	2009-09-10 17:37:16 UTC (rev 4530)
@@ -234,6 +234,9 @@
         loadConfig(configFileName)
         directory = getDirectory()
 
+        #from twistedcaldav.log import setLogLevelForNamespace
+        #setLogLevelForNamespace("twistedcaldav.memcacheprops", "debug")
+
         calendarHomes = set()
 
         for path in calendarHomePaths:
@@ -307,16 +310,15 @@
                 readProperties = readProperties,
                 readIndexes = readIndexes,
             )
-            # OMG NO SRLY FIXME
-            if childName == "meetingmaker":
+            if calendarHome.record.recordType != "users" and childName not in ("inbox", "outbox"):
                 #
                 # Add calendar to F/B set
                 #
                 if calendarHome.record.recordType is dummyDirectoryRecord:
-                    log.err("Unable to edit F/B info for %s" % (calendarHome,))
+                    log.msg("Unable to edit F/B info for %s" % (calendarHome,))
                     continue
 
-                calendarURL = "/calendars/__uids__/%s/meetingmaker" % (calendarHome.record.guid,)
+                calendarURL = "/calendars/__uids__/%s/%s/" % (calendarHome.record.guid, childName)
 
                 inbox = calendarHome.getChild("inbox")
 
@@ -330,13 +332,13 @@
                     needFB = False
 
                     for href in hrefs:
-                        if str(href) == calendarURL:
+                        if str(href).rstrip("/")+"/" == calendarURL:
                             break
                     else:
                         needFB = True
 
                 if needFB:
-                    log.msg("Adding Meeting Maker calendar to F/B set for %s" % (calendarHome,))
+                    log.msg("Adding calendar %s to F/B set for %s" % (childName, calendarHome))
                     hrefs.append(davxml.HRef(calendarURL))
                     fbProp = caldavxml.CalendarFreeBusySet(*hrefs)
                     inbox.writeDeadProperty(fbProp)
@@ -345,7 +347,7 @@
     calendarCollection,
     readCalendarData = True,
     readProperties = True,
-    readIndexes = True
+    readIndexes = True,
 ):
     if readProperties:
         readPropertiesForResource(calendarCollection)
@@ -365,7 +367,9 @@
         if readCalendarData:
             childCalendar = child.iCalendarText()
         if readProperties:
+            #child.deadProperties().flushCache()
             readPropertiesForResource(child)
+            #readProperties = False
 
 def readPropertiesForResource(resource):
     #log.msg(resource)
@@ -373,7 +377,7 @@
         try:
             property = resource.readDeadProperty(qname)
         except Exception, e:
-            log.err("Error reading {%s}%s property on resource %s\n%s\n" % (qname[0], qname[1], resource, e))
+            log.msg("Error reading {%s}%s property on resource %s\n%s\n" % (qname[0], qname[1], resource, e))
             resource.removeDeadProperty(qname)
 
 if __name__ == "__main__":
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090910/e2396859/attachment.html>