<!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>[14863] CalendarServer/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/14863">14863</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-29 13:22:36 -0700 (Fri, 29 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Latest CDT. Minor trash tweaks.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavcontrolapipy">CalendarServer/trunk/twistedcaldav/controlapi.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (14862 => 14863)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt        2015-05-29 20:19:32 UTC (rev 14862)
+++ CalendarServer/trunk/requirements-dev.txt        2015-05-29 20:22:36 UTC (rev 14863)
</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@14859#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14862#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavcontrolapipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/controlapi.py (14862 => 14863)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/controlapi.py        2015-05-29 20:19:32 UTC (rev 14862)
+++ CalendarServer/trunk/twistedcaldav/controlapi.py        2015-05-29 20:22:36 UTC (rev 14863)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx">     DAVResourceWithoutChildrenMixin
</span><span class="cx"> from twistedcaldav.resource import ReadOnlyNoCopyResourceMixIn
</span><span class="cx"> 
</span><ins>+from txdav.caldav.datastore.scheduling.work import ScheduleOrganizerWork, \
+    ScheduleOrganizerSendWork, ScheduleReplyWork, ScheduleRefreshWork, \
+    ScheduleAutoReplyWork
</ins><span class="cx"> from txdav.who.groups import GroupCacherPollingWork, GroupRefreshWork, \
</span><span class="cx">     GroupAttendeeReconciliationWork, GroupDelegateChangesWork, \
</span><span class="cx">     GroupShareeReconciliationWork
</span><span class="lines">@@ -337,3 +340,15 @@
</span><span class="cx">             ))
</span><span class="cx"> 
</span><span class="cx">         returnValue(self._ok(&quot;ok&quot;, &quot;Group refresh scheduled&quot;))
</span><ins>+
+
+    @inlineCallbacks
+    def action_schedulingdone(self, j):
+        &quot;&quot;&quot;
+        Wait for all schedule queue items to complete.
+        &quot;&quot;&quot;
+        yield JobItem.waitWorkDone(self._store.newTransaction, reactor, 120.0, (
+            ScheduleOrganizerWork, ScheduleOrganizerSendWork, ScheduleReplyWork, ScheduleRefreshWork, ScheduleAutoReplyWork,
+        ))
+
+        returnValue(self._ok(&quot;ok&quot;, &quot;Scheduling done&quot;))
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14862 => 14863)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2015-05-29 20:19:32 UTC (rev 14862)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2015-05-29 20:22:36 UTC (rev 14863)
</span><span class="lines">@@ -5205,8 +5205,9 @@
</span><span class="cx">         if ical_new.mainType() is not None:
</span><span class="cx"> 
</span><span class="cx">             if coercePartstatsInExistingResource:
</span><ins>+                organizer = ical_new.getOrganizer()
</ins><span class="cx">                 for attendee in ical_new.getAllAttendeeProperties():
</span><del>-                    if attendee.parameterValue(&quot;SCHEDULE-AGENT&quot;, &quot;SERVER&quot;).upper() == &quot;SERVER&quot; and attendee.hasParameter(&quot;PARTSTAT&quot;):
</del><ins>+                    if attendee.parameterValue(&quot;SCHEDULE-AGENT&quot;, &quot;SERVER&quot;).upper() == &quot;SERVER&quot; and attendee.hasParameter(&quot;PARTSTAT&quot;) and attendee.value() != organizer:
</ins><span class="cx">                         attendee.setParameter(&quot;PARTSTAT&quot;, &quot;NEEDS-ACTION&quot;)
</span><span class="cx"> 
</span><span class="cx">             yield self._setComponentInternal(ical_new, internal_state=ComponentUpdateState.SPLIT_ATTENDEE)
</span><span class="lines">@@ -5299,7 +5300,7 @@
</span><span class="cx">                         newdata = caldata.duplicate()
</span><span class="cx">                         newdata.bumpiTIPInfo(doSequence=True)
</span><span class="cx">                         for attendee in newdata.getAllAttendeeProperties():
</span><del>-                            if attendee.parameterValue(&quot;SCHEDULE-AGENT&quot;, &quot;SERVER&quot;).upper() == &quot;SERVER&quot; and attendee.hasParameter(&quot;PARTSTAT&quot;):
</del><ins>+                            if attendee.parameterValue(&quot;SCHEDULE-AGENT&quot;, &quot;SERVER&quot;).upper() == &quot;SERVER&quot; and attendee.hasParameter(&quot;PARTSTAT&quot;) and attendee.value() != organizer:
</ins><span class="cx">                                 attendee.setParameter(&quot;PARTSTAT&quot;, &quot;NEEDS-ACTION&quot;)
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14862 => 14863)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2015-05-29 20:19:32 UTC (rev 14862)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2015-05-29 20:22:36 UTC (rev 14863)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> import datetime
</span><span class="cx"> import inspect
</span><span class="cx"> import itertools
</span><ins>+import os
</ins><span class="cx"> import sys
</span><span class="cx"> import time
</span><span class="cx"> from uuid import uuid4
</span><span class="lines">@@ -5258,9 +5259,12 @@
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def toTrash(self):
</span><ins>+
+        # Preserve existing resource name extension
+        newName = str(uuid4()) + os.path.splitext(self.name())[1]
+
</ins><span class="cx">         originalCollection = self._parentCollection._resourceID
</span><span class="cx">         trash = yield self._parentCollection.ownerHome().getTrash(create=True)
</span><del>-        newName = str(uuid4())
</del><span class="cx">         yield self.moveTo(trash, name=newName)
</span><span class="cx"> 
</span><span class="cx">         self._original_collection = originalCollection
</span></span></pre>
</div>
</div>

</body>
</html>