<!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>[14524] CalendarServer/branches/users/sagen/trashcan-5</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/14524">14524</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 15:57:26 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>willSplit( ) needs to check non-recurring events for past/future</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5twistedcaldavcaldavxmlpy">CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/caldavxml.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5twistedcaldavstorebridgepy">CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingicalsplitterpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan5twistedcaldavcaldavxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/caldavxml.py (14523 => 14524)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/caldavxml.py 2015-03-06 22:00:19 UTC (rev 14523)
+++ CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/caldavxml.py 2015-03-06 23:57:26 UTC (rev 14524)
</span><span class="lines">@@ -1167,6 +1167,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @registerElement
</span><ins>+class Trash (CalDAVEmptyElement):
+ """
+ Denotes the resource type of a trash collection.
+ """
+ name = "trash"
+
+
+
+@registerElement
</ins><span class="cx"> class ScheduleResponse (CalDAVElement):
</span><span class="cx"> """
</span><span class="cx"> The set of responses for a SCHEDULE method operation.
</span><span class="lines">@@ -1417,3 +1426,4 @@
</span><span class="cx"> ResourceType.calendar = ResourceType(Collection(), Calendar())
</span><span class="cx"> ResourceType.scheduleInbox = ResourceType(Collection(), ScheduleInbox())
</span><span class="cx"> ResourceType.scheduleOutbox = ResourceType(Collection(), ScheduleOutbox())
</span><ins>+ResourceType.trash = ResourceType(Collection(), Trash())
</ins></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5twistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/storebridge.py (14523 => 14524)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/storebridge.py 2015-03-06 22:00:19 UTC (rev 14523)
+++ CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/storebridge.py 2015-03-06 23:57:26 UTC (rev 14524)
</span><span class="lines">@@ -1100,6 +1100,8 @@
</span><span class="cx"> return customxml.ResourceType.sharedownercalendar
</span><span class="cx"> elif self.isShareeResource():
</span><span class="cx"> return customxml.ResourceType.sharedcalendar
</span><ins>+ elif self._newStoreObject.isTrash():
+ return customxml.ResourceType.trash
</ins><span class="cx"> else:
</span><span class="cx"> return caldavxml.ResourceType.calendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingicalsplitterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py (14523 => 14524)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py 2015-03-06 22:00:19 UTC (rev 14523)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py 2015-03-06 23:57:26 UTC (rev 14524)
</span><span class="lines">@@ -58,28 +58,26 @@
</span><span class="cx"> C{True} if a split is required
</span><span class="cx"> C{True} if event is fully in future
</span><span class="cx"> The second boolean's value is undefined if the first is True or
</span><del>- the event is not recurring, or threshold != -1
</del><ins>+ threshold != -1
</ins><span class="cx"> @rtype: C{tuple} of two C{bool}
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> fullyInFuture = False
</span><span class="cx">
</span><del>- # Must be recurring
- if not ical.isRecurring():
- return (False, False)
-
</del><span class="cx"> # Look for past/future (cacheExpandedTimeRanges will go one year in the future by default)
</span><span class="cx"> now = self.now.duplicate()
</span><span class="cx"> now.offsetDay(1)
</span><ins>+
+ # Check recurring
+ if not ical.isRecurring():
+ fullyInFuture = (ical.mainComponent().getStartDateUTC() >= now)
+ return (False, fullyInFuture)
+
</ins><span class="cx"> instances = ical.cacheExpandedTimeRanges(now)
</span><span class="cx"> instances = sorted(instances.instances.values(), key=lambda x: x.start)
</span><span class="cx"> if len(instances) <= 1 or instances[0].start >= self.past or instances[-1].start < self.now:
</span><span class="cx"> # Event is either fully in past or in future
</span><del>- if len(instances) == 0 or instances[0].start >= now:
- # fully in future
- fullyInFuture = True
- else:
- fullyInFuture = False
</del><ins>+ fullyInFuture = (len(instances) == 0 or instances[0].start >= now)
</ins><span class="cx"> return (False, fullyInFuture)
</span><span class="cx">
</span><span class="cx"> if self.threshold != -1:
</span></span></pre>
</div>
</div>
</body>
</html>