<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15132] CalendarServer/branches/users/cdaboo/rscale</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15132">15132</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-17 11:15:38 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>RSCALE support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboorscalerequirementsdevtxt">CalendarServer/branches/users/cdaboo/rscale/requirements-dev.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboorscalerequirementsstabletxt">CalendarServer/branches/users/cdaboo/rscale/requirements-stable.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboorscaletwistedcaldavcaldavxmlpy">CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/caldavxml.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboorscaletwistedcaldavicalpy">CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboorscaletwistedcaldavresourcepy">CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboorscaletwistedcaldavstdconfigpy">CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboorscaletwistedcaldavstorebridgepy">CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/storebridge.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboorscalerequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/requirements-dev.txt (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/requirements-dev.txt 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/requirements-dev.txt 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15066#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15130#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboorscalerequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/requirements-stable.txt (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/requirements-stable.txt 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/requirements-stable.txt 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15118#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15129#egg=twextpy
</ins><span class="cx"> cffi==1.1.0
</span><span class="cx"> pycparser==2.13
</span><span class="cx"> #twisted
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@15020#egg=pycalendar
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/branches/rscale@15020#egg=pycalendar
</ins><span class="cx"> python-dateutil==1.5 # Note: v2.0+ is for Python 3
</span><span class="cx"> pytz==2015.4
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboorscaletwistedcaldavcaldavxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/caldavxml.py (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/caldavxml.py 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/caldavxml.py 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -1467,6 +1467,33 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span><ins>+# RFC7529 (RSCALE)
+#
+
+@registerElement
+class SupportedRscaleSet (CalDAVElement):
+ """
+ List of supported RSCALE values.
+ """
+ name = "supported-rscale-set"
+
+ allowed_children = {(dav_namespace, "supported-rscale"): (0, None)}
+
+ hidden = True
+ protected = True
+
+
+
+@registerElement
+class SupportedRscale (CalDAVTextElement):
+ """
+ A supported RSCALE value.
+ """
+ name = "supported-rscale"
+
+
+
+#
</ins><span class="cx"> # Extensions to ResourceType
</span><span class="cx"> #
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboorscaletwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/ical.py (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/ical.py 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/ical.py 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -57,8 +57,10 @@
</span><span class="cx"> from pycalendar.componentbase import ComponentBase
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx"> from pycalendar.duration import Duration
</span><del>-from pycalendar.exceptions import ErrorBase
</del><ins>+from pycalendar.exceptions import ErrorBase, InvalidProperty
</ins><span class="cx"> from pycalendar.period import Period
</span><ins>+from pycalendar.icalendar.icudatetime import ICUDateTime
+from pycalendar.icalendar.exceptions import InvalidRscaleError
</ins><span class="cx"> from pycalendar.icalendar.property import Property as PyProperty
</span><span class="cx"> from pycalendar.timezone import Timezone
</span><span class="cx"> from pycalendar.utcoffsetvalue import UTCOffsetValue
</span><span class="lines">@@ -418,6 +420,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><ins>+ def allowedRscales(cls):
+ return tuple(map(str.upper, sorted(ICUDateTime.allRSCALEs())))
+
+
+ @classmethod
</ins><span class="cx"> def allFromString(clazz, string, format=None):
</span><span class="cx"> """
</span><span class="cx"> Just default to reading a single VCALENDAR
</span><span class="lines">@@ -481,9 +488,14 @@
</span><span class="cx"> errmsg = "Unknown"
</span><span class="cx"> try:
</span><span class="cx"> result = Calendar.parseData(data, format)
</span><del>- except ErrorBase, e:
</del><ins>+ except InvalidProperty as e:
+ if isinstance(e.mCause, InvalidRscaleError):
+ raise e.mCause
</ins><span class="cx"> errmsg = "{0}: {1}".format(e.mReason, e.mData,)
</span><span class="cx"> result = None
</span><ins>+ except ErrorBase as e:
+ errmsg = "{0}: {1}".format(e.mReason, e.mData,)
+ result = None
</ins><span class="cx"> if not result:
</span><span class="cx"> if isstream:
</span><span class="cx"> data.seek(0)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboorscaletwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/resource.py (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/resource.py 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/resource.py 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -470,6 +470,10 @@
</span><span class="cx"> caldavxml.SupportedCalendarData.qname(),
</span><span class="cx"> customxml.GETCTag.qname(),
</span><span class="cx"> )
</span><ins>+ if config.EnableRSCALE:
+ baseProperties += (
+ caldavxml.SupportedRscaleSet.qname(),
+ )
</ins><span class="cx"> if config.MaxResourceSize:
</span><span class="cx"> baseProperties += (
</span><span class="cx"> caldavxml.MaxResourceSize.qname(),
</span><span class="lines">@@ -653,6 +657,13 @@
</span><span class="cx"> elif qname == caldavxml.ScheduleCalendarTransp.qname() and self.isCalendarCollection():
</span><span class="cx"> returnValue(caldavxml.ScheduleCalendarTransp(caldavxml.Opaque() if self._newStoreObject.isUsedForFreeBusy() else caldavxml.Transparent()))
</span><span class="cx">
</span><ins>+ elif qname == caldavxml.SupportedRscaleSet.qname() and self.isPseudoCalendarCollection():
+ if config.EnableRSCALE:
+ returnValue(caldavxml.SupportedRscaleSet(*[
+ caldavxml.SupportedRscale.fromString(name)
+ for name in Component.allowedRscales()
+ ]))
+
</ins><span class="cx"> elif qname == carddavxml.SupportedAddressData.qname() and self.isAddressBookCollection():
</span><span class="cx"> # CardDAV, section 6.2.2
</span><span class="cx"> dataTypes = []
</span><span class="lines">@@ -2479,6 +2490,11 @@
</span><span class="cx"> caldavxml.TimezoneServiceSet.qname(),
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ if config.EnableRSCALE:
+ existing += (
+ caldavxml.SupportedRscaleSet.qname(),
+ )
+
</ins><span class="cx"> return existing
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2537,6 +2553,13 @@
</span><span class="cx"> else:
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><ins>+ elif qname == caldavxml.SupportedRscaleSet.qname():
+ if config.EnableRSCALE:
+ returnValue(caldavxml.SupportedRscaleSet(*[
+ caldavxml.SupportedRscale.fromString(name)
+ for name in Component.allowedRscales()
+ ]))
+
</ins><span class="cx"> elif qname in DefaultAlarmPropertyMixin.ALARM_PROPERTIES:
</span><span class="cx"> returnValue(self.getDefaultAlarmProperty(qname))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboorscaletwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/stdconfig.py (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/stdconfig.py 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/stdconfig.py 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -547,6 +547,8 @@
</span><span class="cx"> "EnableTimezonesByReference" : True, # Strip out VTIMEZONES that are known
</span><span class="cx"> "UsePackageTimezones" : False, # Use timezone data from twistedcaldav.zoneinfo - don't copy to Data directory
</span><span class="cx">
</span><ins>+ "EnableRSCALE" : False, # Turn on support for non-Gregorian recurrences (RSCALE)
+
</ins><span class="cx"> "EnableBatchUpload" : True, # POST batch uploads
</span><span class="cx"> "MaxResourcesBatchUpload" : 100, # Maximum number of resources in a batch POST
</span><span class="cx"> "MaxBytesBatchUpload" : 10485760, # Maximum size of a batch POST (10 MB)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboorscaletwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/storebridge.py (15131 => 15132)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/storebridge.py 2015-09-17 18:12:16 UTC (rev 15131)
+++ CalendarServer/branches/users/cdaboo/rscale/twistedcaldav/storebridge.py 2015-09-17 18:15:38 UTC (rev 15132)
</span><span class="lines">@@ -98,6 +98,7 @@
</span><span class="cx"> )
</span><span class="cx"> from txweb2.stream import ProducerStream, readStream, MemoryStream
</span><span class="cx"> from twistedcaldav.timezones import TimezoneException
</span><ins>+from pycalendar.icalendar.exceptions import InvalidRscaleError
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> """
</span><span class="lines">@@ -2848,12 +2849,21 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> component = Component.fromString(calendardata, format)
</span><del>- except ValueError, e:
- log.error(str(e))
</del><ins>+ except InvalidRscaleError as e:
+ msg = "Invalid RSCALE value: {ex}\n{ical}".format(ex=e.mReason, ical=calendardata)
+ log.error(msg)
</ins><span class="cx"> raise HTTPError(ErrorResponse(
</span><span class="cx"> responsecode.FORBIDDEN,
</span><ins>+ (caldav_namespace, "supported-rscale"),
+ "Can't parse calendar data: {msg}".format(msg=msg),
+ ))
+ except ValueError as e:
+ msg = str(e)
+ log.error(msg)
+ raise HTTPError(ErrorResponse(
+ responsecode.FORBIDDEN,
</ins><span class="cx"> (caldav_namespace, "valid-calendar-data"),
</span><del>- "Can't parse calendar data: %s" % (str(e),)
</del><ins>+ "Can't parse calendar data: {msg}".format(msg=msg),
</ins><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> # Look for client fixes
</span></span></pre>
</div>
</div>
</body>
</html>