<!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>[15157] CalDAVTester/trunk</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/15157">15157</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-29 04:45:27 -0700 (Tue, 29 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow defaults for filtering of calendar and address data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfopodxml">CalDAVTester/trunk/scripts/server/serverinfo-pod.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfotemplatexml">CalDAVTester/trunk/scripts/server/serverinfo-template.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfodtd">CalDAVTester/trunk/scripts/server/serverinfo.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunksrcserverinfopy">CalDAVTester/trunk/src/serverinfo.py</a></li>
<li><a href="#CalDAVTestertrunksrcxmlDefspy">CalDAVTester/trunk/src/xmlDefs.py</a></li>
<li><a href="#CalDAVTestertrunkverifiersaddressDataMatchpy">CalDAVTester/trunk/verifiers/addressDataMatch.py</a></li>
<li><a href="#CalDAVTestertrunkverifierscalendarDataMatchpy">CalDAVTester/trunk/verifiers/calendarDataMatch.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptsserverserverinfopodxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -720,4 +720,21 @@
</span><span class="cx"> </repeat>
</span><span class="cx">
</span><span class="cx"> </substitutions>
</span><ins>+
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-DTSTAMP</calendardatafilter>
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-AUTO</calendardatafilter>
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-RESET-PARTSTAT</calendardatafilter>
+ <calendardatafilter>CALSCALE</calendardatafilter>
+ <calendardatafilter>PRODID</calendardatafilter>
+ <calendardatafilter>DTSTAMP</calendardatafilter>
+ <calendardatafilter>CREATED</calendardatafilter>
+ <calendardatafilter>LAST-MODIFIED</calendardatafilter>
+ <calendardatafilter>X-WR-CALNAME</calendardatafilter>
+ <calendardatafilter>CLASS=PUBLIC</calendardatafilter>
+ <calendardatafilter>PRIORITY=0</calendardatafilter>
+ <calendardatafilter>TRANSP=OPAQUE</calendardatafilter>
+ <calendardatafilter>SEQUENCE=0</calendardatafilter>
+
+ <addressdatafilter>PRODID</addressdatafilter>
+ <addressdatafilter>REV</addressdatafilter>
</ins><span class="cx"> </serverinfo>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfotemplatexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -853,4 +853,21 @@
</span><span class="cx"> {overrides}
</span><span class="cx">
</span><span class="cx"> </substitutions>
</span><ins>+
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-DTSTAMP</calendardatafilter>
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-AUTO</calendardatafilter>
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-RESET-PARTSTAT</calendardatafilter>
+ <calendardatafilter>CALSCALE</calendardatafilter>
+ <calendardatafilter>PRODID</calendardatafilter>
+ <calendardatafilter>DTSTAMP</calendardatafilter>
+ <calendardatafilter>CREATED</calendardatafilter>
+ <calendardatafilter>LAST-MODIFIED</calendardatafilter>
+ <calendardatafilter>X-WR-CALNAME</calendardatafilter>
+ <calendardatafilter>CLASS=PUBLIC</calendardatafilter>
+ <calendardatafilter>PRIORITY=0</calendardatafilter>
+ <calendardatafilter>TRANSP=OPAQUE</calendardatafilter>
+ <calendardatafilter>SEQUENCE=0</calendardatafilter>
+
+ <addressdatafilter>PRODID</addressdatafilter>
+ <addressdatafilter>REV</addressdatafilter>
</ins><span class="cx"> </serverinfo>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfodtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.dtd (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.dtd 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/scripts/server/serverinfo.dtd 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -17,7 +17,8 @@
</span><span class="cx"> <!ELEMENT serverinfo (host, nonsslport, sslport, unix?,
</span><span class="cx"> host2?, nonsslport2?, sslport2?, unix2?,
</span><span class="cx"> authtype?, waitcount?, waitdelay?, waitsuccess?,
</span><del>- features?, substitutions)? >
</del><ins>+ features?, substitutions,
+ calendardatafilter*, addressdatafilter*)? >
</ins><span class="cx">
</span><span class="cx"> <!ELEMENT host (#PCDATA)>
</span><span class="cx"> <!ELEMENT nonsslport (#PCDATA)>
</span><span class="lines">@@ -39,4 +40,6 @@
</span><span class="cx"> <!ELEMENT substitution (key, value)>
</span><span class="cx"> <!ELEMENT key (#PCDATA)>
</span><span class="cx"> <!ELEMENT value (#PCDATA)>
</span><ins>+ <!ELEMENT calendardatafilter (#PCDATA)>
+ <!ELEMENT addressdatafilter (#PCDATA)>
</ins><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -852,4 +852,21 @@
</span><span class="cx"> </substitution>
</span><span class="cx">
</span><span class="cx"> </substitutions>
</span><ins>+
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-DTSTAMP</calendardatafilter>
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-AUTO</calendardatafilter>
+ <calendardatafilter>ATTENDEE:X-CALENDARSERVER-RESET-PARTSTAT</calendardatafilter>
+ <calendardatafilter>CALSCALE</calendardatafilter>
+ <calendardatafilter>PRODID</calendardatafilter>
+ <calendardatafilter>DTSTAMP</calendardatafilter>
+ <calendardatafilter>CREATED</calendardatafilter>
+ <calendardatafilter>LAST-MODIFIED</calendardatafilter>
+ <calendardatafilter>X-WR-CALNAME</calendardatafilter>
+ <calendardatafilter>CLASS=PUBLIC</calendardatafilter>
+ <calendardatafilter>PRIORITY=0</calendardatafilter>
+ <calendardatafilter>TRANSP=OPAQUE</calendardatafilter>
+ <calendardatafilter>SEQUENCE=0</calendardatafilter>
+
+ <addressdatafilter>PRODID</addressdatafilter>
+ <addressdatafilter>REV</addressdatafilter>
</ins><span class="cx"> </serverinfo>
</span></span></pre></div>
<a id="CalDAVTestertrunksrcserverinfopy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/serverinfo.py (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/serverinfo.py 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/src/serverinfo.py 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> self.waitsuccess = 10
</span><span class="cx"> self.subsdict = {}
</span><span class="cx"> self.extrasubsdict = {}
</span><ins>+ self.calendardatafilters = []
+ self.addressdatafilters = []
</ins><span class="cx">
</span><span class="cx"> # dtnow needs to be fixed to a single date at the start of the tests just in case the tests
</span><span class="cx"> # run over a day boundary.
</span><span class="lines">@@ -193,6 +195,10 @@
</span><span class="cx"> self.parseFeatures(child)
</span><span class="cx"> elif child.tag == src.xmlDefs.ELEMENT_SUBSTITUTIONS:
</span><span class="cx"> self.parseSubstitutionsXML(child)
</span><ins>+ elif child.tag == src.xmlDefs.ELEMENT_CALENDARDATAFILTER:
+ self.calendardatafilters.append(child.text.encode("utf-8"))
+ elif child.tag == src.xmlDefs.ELEMENT_ADDRESSDATAFILTER:
+ self.addressdatafilters.append(child.text.encode("utf-8"))
</ins><span class="cx">
</span><span class="cx"> self.updateParams()
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunksrcxmlDefspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/xmlDefs.py (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/xmlDefs.py 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/src/xmlDefs.py 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -16,10 +16,12 @@
</span><span class="cx">
</span><span class="cx"> # XML Elements/Attributes
</span><span class="cx">
</span><ins>+ELEMENT_ADDRESSDATAFILTER = "addressdatafilter"
</ins><span class="cx"> ELEMENT_ARG = "arg"
</span><span class="cx"> ELEMENT_AUTHTYPE = "authtype"
</span><span class="cx"> ELEMENT_BODY = "body"
</span><span class="cx"> ELEMENT_CALDAVTEST = "caldavtest"
</span><ins>+ELEMENT_CALENDARDATAFILTER = "calendardatafilter"
</ins><span class="cx"> ELEMENT_CALLBACK = "callback"
</span><span class="cx"> ELEMENT_CLIENTS = "clients"
</span><span class="cx"> ELEMENT_CONTENTTYPE = "content-type"
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersaddressDataMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/addressDataMatch.py (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/addressDataMatch.py 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/verifiers/addressDataMatch.py 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -33,8 +33,7 @@
</span><span class="cx"> filters = args.get("filter", [])
</span><span class="cx">
</span><span class="cx"> # Always remove these
</span><del>- filters.append("PRODID")
- filters.append("REV")
</del><ins>+ filters.extend(manager.server_info.addressdatafilters)
</ins><span class="cx">
</span><span class="cx"> # status code must be 200, 201, 207
</span><span class="cx"> if response.status not in (200, 201, 207):
</span><span class="lines">@@ -79,8 +78,13 @@
</span><span class="cx"> if property.hasParameter(parameter):
</span><span class="cx"> property.removeParameters(parameter)
</span><span class="cx"> else:
</span><del>- if property.getName() == filter:
- component.removeProperty(property)
</del><ins>+ if "=" in filter:
+ filter_name, filter_value = filter.split("=")
+ if property.getName() == filter_name and property.getValue().getValue() == filter_value:
+ component.removeProperty(property)
+ else:
+ if property.getName() == filter:
+ component.removeProperty(property)
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> format = Card.sFormatJSON if is_json else Card.sFormatText
</span></span></pre></div>
<a id="CalDAVTestertrunkverifierscalendarDataMatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/calendarDataMatch.py (15156 => 15157)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/calendarDataMatch.py 2015-09-29 08:27:20 UTC (rev 15156)
+++ CalDAVTester/trunk/verifiers/calendarDataMatch.py 2015-09-29 11:45:27 UTC (rev 15157)
</span><span class="lines">@@ -39,15 +39,7 @@
</span><span class="cx"> if "EMAIL parameter" not in manager.server_info.features:
</span><span class="cx"> filters.append("ATTENDEE:EMAIL")
</span><span class="cx"> filters.append("ORGANIZER:EMAIL")
</span><del>- filters.append("ATTENDEE:X-CALENDARSERVER-DTSTAMP")
- filters.append("ATTENDEE:X-CALENDARSERVER-AUTO")
- filters.append("ATTENDEE:X-CALENDARSERVER-RESET-PARTSTAT")
- filters.append("CALSCALE")
- filters.append("PRODID")
- filters.append("DTSTAMP")
- filters.append("CREATED")
- filters.append("LAST-MODIFIED")
- filters.append("X-WR-CALNAME")
</del><ins>+ filters.extend(manager.server_info.calendardatafilters)
</ins><span class="cx">
</span><span class="cx"> for afilter in tuple(filters):
</span><span class="cx"> if afilter[0] == "!" and afilter[1:] in filters:
</span><span class="lines">@@ -99,6 +91,10 @@
</span><span class="cx"> for subcomponent in component.getComponents():
</span><span class="cx"> removePropertiesParameters(subcomponent)
</span><span class="cx">
</span><ins>+ if component.getType() == "VEVENT":
+ if component.hasEnd():
+ component.editTimingStartDuration(component.getStart(), component.getEnd() - component.getStart())
+
</ins><span class="cx"> allProps = []
</span><span class="cx"> for properties in component.getProperties().itervalues():
</span><span class="cx"> allProps.extend(properties)
</span><span class="lines">@@ -115,8 +111,13 @@
</span><span class="cx"> if property.hasParameter(parameter):
</span><span class="cx"> property.removeParameters(parameter)
</span><span class="cx"> else:
</span><del>- if property.getName() == filter:
- component.removeProperty(property)
</del><ins>+ if "=" in filter:
+ filter_name, filter_value = filter.split("=")
+ if property.getName() == filter_name and property.getValue().getValue() == filter_value:
+ component.removeProperty(property)
+ else:
+ if property.getName() == filter:
+ component.removeProperty(property)
</ins><span class="cx">
</span><span class="cx"> def reconcileRecurrenceOverrides(calendar1, calendar2):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>