March 2009 - calendarserver-changes

[3943] CalendarServer/trunk/conf/caldavd.plist
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3943 http://trac.macosforge.org/projects/calendarserver/changeset/3943 Author: wsanchez(a)apple.com Date: 2009-03-31 14:16:07 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Use canonical port numbers by default Modified Paths: -------------- CalendarServer/trunk/conf/caldavd.plist Modified: CalendarServer/trunk/conf/caldavd.plist =================================================================== --- CalendarServer/trunk/conf/caldavd.plist 2009-03-31 21:04:49 UTC (rev 3942) +++ CalendarServer/trunk/conf/caldavd.plist 2009-03-31 21:16:07 UTC (rev 3943) @@ -36,13 +36,13 @@  <key>HTTPPort</key> - <integer>8008</integer> + <integer>80</integer>

1 0

[3942] CalendarServer/trunk/twistedcaldav/accesslog.py
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3942 http://trac.macosforge.org/projects/calendarserver/changeset/3942 Author: sagen(a)apple.com Date: 2009-03-31 14:04:49 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Another localhost --> 127.0.0.1 Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/accesslog.py Modified: CalendarServer/trunk/twistedcaldav/accesslog.py =================================================================== --- CalendarServer/trunk/twistedcaldav/accesslog.py 2009-03-31 20:58:52 UTC (rev 3941) +++ CalendarServer/trunk/twistedcaldav/accesslog.py 2009-03-31 21:04:49 UTC (rev 3942) @@ -283,7 +283,7 @@ if self.mode == "AF_UNIX": d = self.client.connectUNIX(self.id) else: - d = self.client.connectTCP("localhost", self.id) + d = self.client.connectTCP("127.0.0.1", self.id) d.addCallback(_gotProtocol) def stop(self):

1 0

[3941] CalendarServer/trunk/twistedcaldav/index.py
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3941 http://trac.macosforge.org/projects/calendarserver/changeset/3941 Author: cdaboo(a)apple.com Date: 2009-03-31 13:58:52 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Properly index events in the future. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/index.py Modified: CalendarServer/trunk/twistedcaldav/index.py =================================================================== --- CalendarServer/trunk/twistedcaldav/index.py 2009-03-31 20:56:48 UTC (rev 3940) +++ CalendarServer/trunk/twistedcaldav/index.py 2009-03-31 20:58:52 UTC (rev 3941) @@ -470,14 +470,22 @@ """ uid = calendar.resourceUID() - if expand_until: - expand = expand_until + # Decide how far to expand based on the component + master = calendar.masterComponent() + if master is None or not calendar.isRecurring() and not calendar.isRecurringUnbounded(): + # When there is no master we have a set of overridden components - index them all. + # When there is one instance - index it. + # When bounded - index all. + expand = datetime.datetime(2100, 1, 1, 0, 0, 0, tzinfo=utc) else: - expand = datetime.date.today() + default_future_expansion_duration + if expand_until: + expand = expand_until + else: + expand = datetime.date.today() + default_future_expansion_duration + + if expand > (datetime.date.today() + maximum_future_expansion_duration): + raise IndexedSearchException - if expand > (datetime.date.today() + maximum_future_expansion_duration): - raise IndexedSearchException - instances = calendar.expandTimeRanges(expand) self._delete_from_db(name, uid)

1 0

[3940] CalDAVTester/trunk
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3940 http://trac.macosforge.org/projects/calendarserver/changeset/3940 Author: cdaboo(a)apple.com Date: 2009-03-31 13:56:48 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Test time-range on events far in the future. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/reports.xml Added Paths: ----------- CalDAVTester/trunk/Resource/reports/put/20.txt CalDAVTester/trunk/Resource/reports/put/21.txt CalDAVTester/trunk/Resource/reports/put/22.txt Added: CalDAVTester/trunk/Resource/reports/put/20.txt =================================================================== --- CalDAVTester/trunk/Resource/reports/put/20.txt (rev 0) +++ CalDAVTester/trunk/Resource/reports/put/20.txt 2009-03-31 20:56:48 UTC (rev 3940) @@ -0,0 +1,32 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20050101T140000Z +CREATED:20050101T150000Z +DTSTART;TZID=US/Eastern:20200101T100000 +DURATION:PT1H +SUMMARY:event 18 +UID:54E181BC7CCC373042B28842-18@ninevah.local +CATEGORIES:cool +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/reports/put/21.txt =================================================================== --- CalDAVTester/trunk/Resource/reports/put/21.txt (rev 0) +++ CalDAVTester/trunk/Resource/reports/put/21.txt 2009-03-31 20:56:48 UTC (rev 3940) @@ -0,0 +1,33 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20050101T140000Z +CREATED:20050101T150000Z +DTSTART;TZID=US/Eastern:20200101T100000 +DURATION:PT1H +RRULE:FREQ=YEARLY +SUMMARY:event 19 +UID:54E181BC7CCC373042B28842-19@ninevah.local +CATEGORIES:cool +END:VEVENT +END:VCALENDAR Added: CalDAVTester/trunk/Resource/reports/put/22.txt =================================================================== --- CalDAVTester/trunk/Resource/reports/put/22.txt (rev 0) +++ CalDAVTester/trunk/Resource/reports/put/22.txt 2009-03-31 20:56:48 UTC (rev 3940) @@ -0,0 +1,33 @@ +BEGIN:VCALENDAR +CALSCALE:GREGORIAN +PRODID:-//Cyrusoft International\, Inc.//Mulberry v4.0//EN +VERSION:2.0 +BEGIN:VTIMEZONE +LAST-MODIFIED:20040110T032845Z +TZID:US/Eastern +BEGIN:DAYLIGHT +DTSTART:20000404T020000 +RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4 +TZNAME:EDT +TZOFFSETFROM:-0500 +TZOFFSETTO:-0400 +END:DAYLIGHT +BEGIN:STANDARD +DTSTART:20001026T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +TZNAME:EST +TZOFFSETFROM:-0400 +TZOFFSETTO:-0500 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +DTSTAMP:20050101T140000Z +CREATED:20050101T150000Z +DTSTART;TZID=US/Eastern:20200101T100000 +DURATION:PT1H +RECURRENCE-ID;TZID=US/Eastern:20200101T100000 +SUMMARY:event 20 +UID:54E181BC7CCC373042B28842-20@ninevah.local +CATEGORIES:cool +END:VEVENT +END:VCALENDAR Modified: CalDAVTester/trunk/scripts/tests/reports.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/reports.xml 2009-03-31 20:28:47 UTC (rev 3939) +++ CalDAVTester/trunk/scripts/tests/reports.xml 2009-03-31 20:56:48 UTC (rev 3940) @@ -158,6 +158,30 @@ </request> <request end-delete="yes"> <method>PUT</method> + <ruri>$calendarpath1:/20.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/reports/put/20.txt</filepath> + </data> + </request> + <request end-delete="yes"> + <method>PUT</method> + <ruri>$calendarpath1:/21.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/reports/put/21.txt</filepath> + </data> + </request> + <request end-delete="yes"> + <method>PUT</method> + <ruri>$calendarpath1:/22.ics</ruri> + <data> + <content-type>text/calendar; charset=utf-8</content-type> + <filepath>Resource/reports/put/22.txt</filepath> + </data> + </request> + <request end-delete="yes"> + <method>PUT</method> <ruri>$calendarpath1:/101.ics</ruri> <data> <content-type>text/calendar; charset=utf-8</content-type> @@ -410,6 +434,9 @@ <value>14.ics</value> <value>18.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -458,6 +485,8 @@ <value>13.ics</value> <value>14.ics</value> <value>18.ics</value> + <value>20.ics</value> + <value>21.ics</value> </arg> </verify> </request> @@ -484,6 +513,7 @@ <value>8.ics</value> <value>9.ics</value> <value>19.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -536,6 +566,9 @@ <value>14.ics</value> <value>18.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -585,6 +618,9 @@ <value>13.ics</value> <value>14.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -635,6 +671,9 @@ <value>13.ics</value> <value>14.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -653,6 +692,7 @@ <arg> <name>okhrefs</name> <value>6.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -747,6 +787,9 @@ <value>14.ics</value> <value>18.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> <value>101.ics</value> <value>102.ics</value> <value>103.ics</value> @@ -777,6 +820,8 @@ <value>13.ics</value> <value>14.ics</value> <value>18.ics</value> + <value>20.ics</value> + <value>21.ics</value> <value>101.ics</value> </arg> </verify> @@ -830,6 +875,9 @@ <value>14.ics</value> <value>18.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> </arg> </verify> </request> @@ -1172,6 +1220,7 @@ <arg> <name>okhrefs</name> <value>19.ics</value> + <value>21.ics</value> </arg> </verify> </request> @@ -1201,6 +1250,9 @@ <value>14.ics</value> <value>18.ics</value> <value>19.ics</value> + <value>20.ics</value> + <value>21.ics</value> + <value>22.ics</value> </arg> </verify> </request>

1 0

[3939] CalendarServer/trunk
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3939 http://trac.macosforge.org/projects/calendarserver/changeset/3939 Author: sagen(a)apple.com Date: 2009-03-31 13:28:47 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Use 127.0.0.1 rather than localhost to avoid resolving to an ipv6 address we don't currently support Modified Paths: -------------- CalendarServer/trunk/calendarserver/tap/caldav.py CalendarServer/trunk/conf/caldavd-apple.plist CalendarServer/trunk/conf/caldavd-test.plist CalendarServer/trunk/conf/caldavd.plist CalendarServer/trunk/twistedcaldav/config.py CalendarServer/trunk/twistedcaldav/mail.py Modified: CalendarServer/trunk/calendarserver/tap/caldav.py =================================================================== --- CalendarServer/trunk/calendarserver/tap/caldav.py 2009-03-31 18:32:06 UTC (rev 3938) +++ CalendarServer/trunk/calendarserver/tap/caldav.py 2009-03-31 20:28:47 UTC (rev 3939) @@ -1010,7 +1010,7 @@ if ( config.Notifications.Enabled and - config.Notifications.InternalNotificationHost == "localhost" + config.Notifications.InternalNotificationHost == "127.0.0.1" ): self.log_info("Adding notification service") @@ -1026,7 +1026,7 @@ if ( config.Scheduling.iMIP.Enabled and - config.Scheduling.iMIP.MailGatewayServer == "localhost" + config.Scheduling.iMIP.MailGatewayServer == "127.0.0.1" ): self.log_info("Adding mail gateway service") Modified: CalendarServer/trunk/conf/caldavd-apple.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-apple.plist 2009-03-31 18:32:06 UTC (rev 3938) +++ CalendarServer/trunk/conf/caldavd-apple.plist 2009-03-31 20:28:47 UTC (rev 3939) @@ -379,7 +379,7 @@ <key>Enabled</key> <false/> <key>MailGatewayServer</key> - <string>localhost</string> + <string>127.0.0.1</string> <key>MailGatewayPort</key> <integer>62310</integer> <key>Sending</key> Modified: CalendarServer/trunk/conf/caldavd-test.plist =================================================================== --- CalendarServer/trunk/conf/caldavd-test.plist 2009-03-31 18:32:06 UTC (rev 3938) +++ CalendarServer/trunk/conf/caldavd-test.plist 2009-03-31 20:28:47 UTC (rev 3939) @@ -419,7 +419,7 @@ <integer>3</integer> <key>InternalNotificationHost</key> - <string>localhost</string> + <string>127.0.0.1</string> <key>InternalNotificationPort</key> <integer>62309</integer> @@ -532,7 +532,7 @@ <key>Enabled</key> <false/> <key>MailGatewayServer</key> - <string>localhost</string> + <string>127.0.0.1</string> <key>MailGatewayPort</key> <integer>62310</integer> <key>Sending</key> Modified: CalendarServer/trunk/conf/caldavd.plist =================================================================== --- CalendarServer/trunk/conf/caldavd.plist 2009-03-31 18:32:06 UTC (rev 3938) +++ CalendarServer/trunk/conf/caldavd.plist 2009-03-31 20:28:47 UTC (rev 3939) @@ -376,7 +376,7 @@ <key>Enabled</key> <false/> <key>MailGatewayServer</key> - <string>localhost</string> + <string>127.0.0.1</string> <key>MailGatewayPort</key> <integer>62310</integer> <key>Sending</key> Modified: CalendarServer/trunk/twistedcaldav/config.py =================================================================== --- CalendarServer/trunk/twistedcaldav/config.py 2009-03-31 18:32:06 UTC (rev 3938) +++ CalendarServer/trunk/twistedcaldav/config.py 2009-03-31 20:28:47 UTC (rev 3939) @@ -258,7 +258,7 @@ "iMIP": { "Enabled" : False, # Server-to-iMIP protocol - "MailGatewayServer" : "localhost", + "MailGatewayServer" : "127.0.0.1", "MailGatewayPort" : 62310, "Username" : "com.apple.calendarserver", # For account injecting replies "Password" : "", # For account injecting replies @@ -304,7 +304,7 @@ "Notifications" : { "Enabled": False, "CoalesceSeconds" : 3, - "InternalNotificationHost" : "localhost", + "InternalNotificationHost" : "127.0.0.1", "InternalNotificationPort" : 62309, "BindAddress" : "127.0.0.1", Modified: CalendarServer/trunk/twistedcaldav/mail.py =================================================================== --- CalendarServer/trunk/twistedcaldav/mail.py 2009-03-31 18:32:06 UTC (rev 3938) +++ CalendarServer/trunk/twistedcaldav/mail.py 2009-03-31 20:28:47 UTC (rev 3939) @@ -543,8 +543,8 @@ port = config.HTTPPort # If we're running on same host as calendar server, inject via localhost - if config.Scheduling['iMIP']['MailGatewayServer'] == 'localhost': - host = 'localhost' + if config.Scheduling['iMIP']['MailGatewayServer'] == '127.0.0.1': + host = '127.0.0.1' else: host = config.ServerHostName path = "inbox"

1 0

[3938] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3938 http://trac.macosforge.org/projects/calendarserver/changeset/3938 Author: wsanchez(a)apple.com Date: 2009-03-31 11:32:06 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Undo 3937 for now Modified Paths: -------------- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch =================================================================== --- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch 2009-03-31 06:56:47 UTC (rev 3937) +++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch 2009-03-31 18:32:06 UTC (rev 3938) @@ -2,15 +2,7 @@ =================================================================== --- twisted/web2/http.py (revision 19773) +++ twisted/web2/http.py (working copy) -@@ -15,6 +15,7 @@ - import socket - import time - import cgi -+import urllib - - # twisted imports - from twisted.internet import interfaces, error -@@ -26,7 +27,7 @@ +@@ -26,7 +26,7 @@ from twisted.web2 import http_headers from twisted.web2 import iweb from twisted.web2 import stream @@ -19,7 +11,7 @@ defaultPortForScheme = {'http': 80, 'https':443, 'ftp':21} -@@ -66,9 +67,9 @@ +@@ -66,9 +66,9 @@ object. @type codeOrResponse: C{int} or L{http.Response} """ @@ -32,16 +24,7 @@ def __repr__(self): return "<%s %s>" % (self.__class__.__name__, self.response) -@@ -174,7 +175,7 @@ - "Document moved to %s." % (location,) - ) - -- self.headers.setHeader("location", location) -+ self.headers.setHeader("location", urllib.quote(location, safe=":/")) - - - def NotModifiedResponse(oldResponse=None): -@@ -408,9 +409,22 @@ +@@ -408,9 +408,22 @@ def _sendContinue(self): self.chanRequest.writeIntermediateResponse(responsecode.CONTINUE) @@ -65,7 +48,7 @@ def _error(self, reason): if reason.check(error.ConnectionLost): -@@ -471,5 +485,5 @@ +@@ -471,5 +484,5 @@ else: components.registerAdapter(compat.OldResourceAdapter, resource.IResource, iweb.IOldNevowResource)

1 0

[3937] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3937 http://trac.macosforge.org/projects/calendarserver/changeset/3937 Author: darla(a)apple.com Date: 2009-03-30 23:56:47 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Encoding the URI in the Location header of the redirect response. Modified Paths: -------------- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch =================================================================== --- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch 2009-03-31 05:13:53 UTC (rev 3936) +++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch 2009-03-31 06:56:47 UTC (rev 3937) @@ -2,7 +2,15 @@ =================================================================== --- twisted/web2/http.py (revision 19773) +++ twisted/web2/http.py (working copy) -@@ -26,7 +26,7 @@ +@@ -15,6 +15,7 @@ + import socket + import time + import cgi ++import urllib + + # twisted imports + from twisted.internet import interfaces, error +@@ -26,7 +27,7 @@ from twisted.web2 import http_headers from twisted.web2 import iweb from twisted.web2 import stream @@ -11,7 +19,7 @@ defaultPortForScheme = {'http': 80, 'https':443, 'ftp':21} -@@ -66,9 +66,9 @@ +@@ -66,9 +67,9 @@ object. @type codeOrResponse: C{int} or L{http.Response} """ @@ -24,7 +32,16 @@ def __repr__(self): return "<%s %s>" % (self.__class__.__name__, self.response) -@@ -408,9 +408,22 @@ +@@ -174,7 +175,7 @@ + "Document moved to %s." % (location,) + ) + +- self.headers.setHeader("location", location) ++ self.headers.setHeader("location", urllib.quote(location, safe=":/")) + + + def NotModifiedResponse(oldResponse=None): +@@ -408,9 +409,22 @@ def _sendContinue(self): self.chanRequest.writeIntermediateResponse(responsecode.CONTINUE) @@ -48,7 +65,7 @@ def _error(self, reason): if reason.check(error.ConnectionLost): -@@ -471,5 +484,5 @@ +@@ -471,5 +485,5 @@ else: components.registerAdapter(compat.OldResourceAdapter, resource.IResource, iweb.IOldNevowResource)

1 0

[3936] CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3936 http://trac.macosforge.org/projects/calendarserver/changeset/3936 Author: wsanchez(a)apple.com Date: 2009-03-30 22:13:53 -0700 (Mon, 30 Mar 2009) Log Message: ----------- print -> log 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-03-31 05:13:02 UTC (rev 3935) +++ CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup 2009-03-31 05:13:53 UTC (rev 3936) @@ -302,7 +302,7 @@ # Add calendar to F/B set # if calendarHome.record == dummyDirectoryRecord: - print "Unable to edit F/B info for %s" % (calendarHome,) + log.err("Unable to edit F/B info for %s" % (calendarHome,)) continue calendarURL = "/calendars/__uids__/%s/meetingmaker" % (calendarHome.record.guid,) @@ -319,7 +319,6 @@ needFB = False for href in hrefs: - print "*"*10, href if str(href) == calendarURL: break else:

1 0

[3935] CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3935 http://trac.macosforge.org/projects/calendarserver/changeset/3935 Author: wsanchez(a)apple.com Date: 2009-03-30 22:13:02 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Add MM calendar to F/B set. 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-03-31 00:38:29 UTC (rev 3934) +++ CalendarServer/branches/users/wsanchez/deployment/bin/caldav_warmup 2009-03-31 05:13:02 UTC (rev 3935) @@ -37,7 +37,9 @@ from twisted.python import log from twisted.python.reflect import namedClass +from twisted.web2.dav import davxml +from twistedcaldav import caldavxml from twistedcaldav.resource import isPseudoCalendarCollectionResource from twistedcaldav.static import CalDAVFile, CalendarHomeFile from twistedcaldav.config import config, defaultConfigFile @@ -170,14 +172,15 @@ configFileName = None outputFileName = None - calendarHomes = set() + directory = None + calendarHomePaths = set() records = set() allRecords = False readCalendarData = True readProperties = True readIndexes = True - observer = log.FileLogObserver(open("/ngs/app/icalt/warmup/warmup.log", "a")) + observer = log.FileLogObserver(open("/dev/stdout", "a")) log.addObserver(observer.emit) def checkExists(resource): @@ -205,11 +208,7 @@ readIndexes = False elif opt in ("-H", "--home"): - path = abspath(arg) - parent = CalDAVFile(dirname(abspath(path))) - calendarHome = CalendarHomeFile(arg, parent, dummyDirectoryRecord) - checkExists(calendarHome) - calendarHomes.add(calendarHome) + calendarHomePaths.add(arg) elif opt in ("-r", "--record"): try: @@ -228,10 +227,25 @@ if args: usage("Too many arguments: %s" % (" ".join(args),)) - if records or allRecords: - config = loadConfig(configFileName) + if records or allRecords or calendarHomePaths: + loadConfig(configFileName) directory = getDirectory() + calendarHomes = set() + + for path in calendarHomePaths: + path = abspath(path) + guid = os.path.basename(path) + + record = directory.recordWithGUID(guid) + if record is None: + record = dummyDirectoryRecord + + parent = CalDAVFile(dirname(abspath(path))) + calendarHome = CalendarHomeFile(arg, parent, record) + checkExists(calendarHome) + calendarHomes.add(calendarHome) + for record in records: recordType, shortName = record calendarHome = directory.calendarHomeForShortName(recordType, shortName) @@ -255,6 +269,7 @@ log.msg("%.2f%% (%d of %d)" % (100.0 * n/N, n, N)) processCalendarHome( calendarHome, + directory = directory, readCalendarData = readCalendarData, readProperties = readProperties, readIndexes = readIndexes, @@ -262,6 +277,7 @@ def processCalendarHome( calendarHome, + directory = None, readCalendarData = True, readProperties = True, readIndexes = True @@ -280,7 +296,41 @@ readProperties = readProperties, readIndexes = readIndexes, ) + # OMG NO SRLY FIXME + if childName == "meetingmaker": + # + # Add calendar to F/B set + # + if calendarHome.record == dummyDirectoryRecord: + print "Unable to edit F/B info for %s" % (calendarHome,) + continue + calendarURL = "/calendars/__uids__/%s/meetingmaker" % (calendarHome.record.guid,) + + inbox = calendarHome.getChild("inbox") + + if not inbox.hasDeadProperty(caldavxml.CalendarFreeBusySet): + needFB = True + hrefs = [] + else: + fbProp = inbox.readDeadProperty(caldavxml.CalendarFreeBusySet) + hrefs = list(fbProp.childrenOfType(davxml.HRef)) + + needFB = False + + for href in hrefs: + print "*"*10, href + if str(href) == calendarURL: + break + else: + needFB = True + + if needFB: + log.msg("Adding Meeting Maker calendar to F/B set for %s" % (calendarHome,)) + hrefs.append(davxml.HRef(calendarURL)) + fbProp = caldavxml.CalendarFreeBusySet(*hrefs) + inbox.writeDeadProperty(fbProp) + def processCalendar( calendarCollection, readCalendarData = True, @@ -299,7 +349,7 @@ if calendarCollection.fp.basename() != "outbox": raise - for name in calendarCollection.listChildren() + for name in calendarCollection.listChildren(): child = calendarCollection.getChild(name) if readCalendarData: @@ -308,7 +358,7 @@ readPropertiesForResource(child) def readPropertiesForResource(resource): - log.msg(resource) + #log.msg(resource) for qname in tuple(resource.deadProperties().list()): try: property = resource.readDeadProperty(qname)

1 0

[3934] CalendarServer/branches/users/wsanchez/deployment/python
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 3934 http://trac.macosforge.org/projects/calendarserver/changeset/3934 Author: wsanchez(a)apple.com Date: 2009-03-30 17:38:29 -0700 (Mon, 30 Mar 2009) Log Message: ----------- python Added Paths: ----------- CalendarServer/branches/users/wsanchez/deployment/python Added: CalendarServer/branches/users/wsanchez/deployment/python =================================================================== --- CalendarServer/branches/users/wsanchez/deployment/python (rev 0) +++ CalendarServer/branches/users/wsanchez/deployment/python 2009-03-31 00:38:29 UTC (rev 3934) @@ -0,0 +1,7 @@ +#!/bin/sh + +wd="$(cd "$(dirname "$0")" && pwd)"; + +export PYTHONPATH="$("${wd}/run" -p)"; + +python "$@"; Property changes on: CalendarServer/branches/users/wsanchez/deployment/python ___________________________________________________________________ Added: svn:executable + *

1 0