<!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>[14843] 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/14843">14843</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-28 13:00:18 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix for splitting of an attendee trashed item. Trash api clean-up.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolstrashpy">CalendarServer/trunk/calendarserver/tools/trash.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoresqlpy">CalendarServer/trunk/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretesttest_trashpy">CalendarServer/trunk/txdav/common/datastore/test/test_trash.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolstrashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/trash.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/trash.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/calendarserver/tools/trash.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> component = yield event.component()
</span><span class="cx"> mainSummary = component.mainComponent().propertyValue("SUMMARY", u"<no title>")
</span><del>- whenTrashed = yield event.whenTrashed()
</del><ins>+ whenTrashed = event.whenTrashed()
</ins><span class="cx"> ago = nowDT - whenTrashed
</span><span class="cx"> print(" Trashed {}:".format(agoString(ago)))
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx">
</span><span class="cx"> component = yield event.component()
</span><span class="cx"> mainSummary = component.mainComponent().propertyValue("SUMMARY", u"<no title>")
</span><del>- whenTrashed = yield event.whenTrashed()
</del><ins>+ whenTrashed = event.whenTrashed()
</ins><span class="cx"> ago = nowDT - whenTrashed
</span><span class="cx">
</span><span class="cx"> detail["summary"] = mainSummary
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/requirements-dev.txt 2015-05-28 20:00:18 UTC (rev 14843)
</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@14811#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14840#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14842#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if calendar_resource:
</span><span class="cx"> self.recipient_calendar = (yield calendar_resource.componentForUser(self.recipient.record.uid)).duplicate()
</span><span class="cx"> self.recipient_calendar_resource = calendar_resource
</span><del>- self.recipient_in_trash = (yield self.recipient_calendar_resource.isInTrash())
</del><ins>+ self.recipient_in_trash = self.recipient_calendar_resource.isInTrash()
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> objectResources = (yield self.getCalendarResourcesForUID(uid))
</span><span class="cx"> for objectResource in objectResources:
</span><span class="cx"> # The matching calendar resource is in the trash, so delete it
</span><del>- if (yield objectResource.isInTrash()):
</del><ins>+ if objectResource.isInTrash():
</ins><span class="cx"> yield objectResource.purge(implicitly=False)
</span><span class="cx"> continue
</span><span class="cx"> if ok_object and objectResource._resourceID == ok_object._resourceID:
</span><span class="lines">@@ -3936,6 +3936,8 @@
</span><span class="cx"> )[0]
</span><span class="cx"> self._created = parseSQLTimestamp(self._created)
</span><span class="cx"> self._modified = parseSQLTimestamp(self._modified)
</span><ins>+ self._original_collection = None
+ self._trashed = None
</ins><span class="cx"> else:
</span><span class="cx"> values[co.MODIFIED] = utcNowSQL
</span><span class="cx"> self._modified = parseSQLTimestamp((
</span><span class="lines">@@ -5160,6 +5162,12 @@
</span><span class="cx"> split_details=(rid, newerUID, False, False)
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ # Reconcile trash state
+ if self.isInTrash():
+ yield olderObject._updateToTrashQuery.on(
+ olderObject._txn, originalCollection=self._original_collection, trashed=self._trashed, resourceID=olderObject._resourceID
+ )
+
</ins><span class="cx"> # Split each one - but not this resource
</span><span class="cx"> for resource in resources:
</span><span class="cx"> if resource._resourceID == self._resourceID:
</span><span class="lines">@@ -5208,9 +5216,15 @@
</span><span class="cx">
</span><span class="cx"> # Create a new resource and store its data (but not if the parent is "inbox", or if it is empty)
</span><span class="cx"> if not self.calendar().isInbox() and ical_old.mainType() is not None:
</span><del>- yield self.calendar()._createCalendarObjectWithNameInternal("{0}.ics".format(olderUID,), ical_old, ComponentUpdateState.SPLIT_ATTENDEE)
</del><ins>+ olderObject = yield self.calendar()._createCalendarObjectWithNameInternal("{0}.ics".format(olderUID,), ical_old, ComponentUpdateState.SPLIT_ATTENDEE)
</ins><span class="cx">
</span><ins>+ # Reconcile trash state
+ if self.isInTrash():
+ yield olderObject._updateToTrashQuery.on(
+ olderObject._txn, originalCollection=self._original_collection, trashed=self._trashed, resourceID=olderObject._resourceID
+ )
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class CalendarObjectSplitterWork(WorkItem, fromTable(schema.CALENDAR_OBJECT_SPLITTER_WORK)):
</span><span class="cx">
</span><span class="cx"> group = property(lambda self: (self.table.RESOURCE_ID == self.resourceID))
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/sql.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -2634,6 +2634,8 @@
</span><span class="cx"> )[0]
</span><span class="cx"> self._created = parseSQLTimestamp(self._created)
</span><span class="cx"> self._modified = parseSQLTimestamp(self._modified)
</span><ins>+ self._is_in_trash = None
+ self._trashed = None
</ins><span class="cx">
</span><span class="cx"> # delete foreign members table rows for this object
</span><span class="cx"> groupIDRows = yield Select(
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -3706,7 +3706,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if config.EnableTrashCollection:
</span><del>- isInTrash = yield self.isInTrash()
</del><ins>+ isInTrash = self.isInTrash()
</ins><span class="cx"> if isInTrash:
</span><span class="cx"> raise AlreadyInTrashError
</span><span class="cx"> else:
</span><span class="lines">@@ -3835,12 +3835,6 @@
</span><span class="cx"> yield child.fromTrash()
</span><span class="cx">
</span><span class="cx">
</span><del>- @classproperty
- def _selectIsInTrashQuery(cls):
- table = cls._homeChildMetaDataSchema
- return Select((table.IS_IN_TRASH, table.TRASHED), From=table, Where=table.RESOURCE_ID == Parameter("resourceID"))
-
-
</del><span class="cx"> def isInTrash(self):
</span><span class="cx"> return getattr(self, "_isInTrash", False)
</span><span class="cx">
</span><span class="lines">@@ -5268,8 +5262,11 @@
</span><span class="cx"> trash = yield self._parentCollection.ownerHome().getTrash(create=True)
</span><span class="cx"> newName = str(uuid4())
</span><span class="cx"> yield self.moveTo(trash, name=newName)
</span><ins>+
+ self._original_collection = originalCollection
+ self._trashed = datetime.datetime.utcnow()
</ins><span class="cx"> yield self._updateToTrashQuery.on(
</span><del>- self._txn, originalCollection=originalCollection, trashed=datetime.datetime.utcnow(), resourceID=self._resourceID
</del><ins>+ self._txn, originalCollection=self._original_collection, trashed=self._trashed, resourceID=self._resourceID
</ins><span class="cx"> )
</span><span class="cx"> returnValue(newName)
</span><span class="cx">
</span><span class="lines">@@ -5278,37 +5275,23 @@
</span><span class="cx"> def fromTrash(self):
</span><span class="cx"> originalCollection = yield self.originalCollection()
</span><span class="cx"> yield self.moveTo(originalCollection)
</span><ins>+
+ self._original_collection = None
+ self._trashed = None
</ins><span class="cx"> yield self._updateFromTrashQuery.on(
</span><span class="cx"> self._txn, resourceID=self._resourceID
</span><span class="cx"> )
</span><span class="cx"> returnValue(self._name)
</span><span class="cx">
</span><span class="cx">
</span><del>- @classproperty
- def _selectIsInTrashQuery(cls):
- obj = cls._objectSchema
- return Select((obj.ORIGINAL_COLLECTION, obj.TRASHED), From=obj, Where=obj.RESOURCE_ID == Parameter("resourceID"))
-
-
- @inlineCallbacks
</del><span class="cx"> def isInTrash(self):
</span><del>- originalCollectionID = (
- yield self._selectIsInTrashQuery.on(
- self._txn, resourceID=self._resourceID
- )
- )[0][0]
- returnValue(originalCollectionID is not None)
</del><ins>+ return (getattr(self, "_original_collection", None) is not None) or getattr(self, "_isInTrash", False)
</ins><span class="cx">
</span><span class="cx">
</span><del>- @inlineCallbacks
</del><span class="cx"> def whenTrashed(self):
</span><del>- returnValue(
- (
- yield self._selectIsInTrashQuery.on(
- self._txn, resourceID=self._resourceID
- )
- )[0][1]
- )
</del><ins>+ if self._trashed is None:
+ return None
+ return parseSQLTimestamp(self._trashed)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def purge(self):
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretesttest_trashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_trash.py (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-05-28 19:58:44 UTC (rev 14842)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-05-28 20:00:18 UTC (rev 14843)
</span><span class="lines">@@ -165,8 +165,8 @@
</span><span class="cx"> self.assertEquals(len(objects), 0)
</span><span class="cx">
</span><span class="cx"> # Verify it's not in the trash
</span><del>- self.assertFalse((yield resource.isInTrash()))
- trashed = yield resource.whenTrashed()
</del><ins>+ self.assertFalse(resource.isInTrash())
+ trashed = resource.whenTrashed()
</ins><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx">
</span><span class="cx"> # Move object to trash
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx">
</span><span class="cx"> # Verify it's in the trash
</span><span class="cx"> resource = yield self._getResource(txn, "user01", trash.name(), newName)
</span><del>- self.assertTrue((yield resource.isInTrash()))
- trashed = yield resource.whenTrashed()
</del><ins>+ self.assertTrue(resource.isInTrash())
+ trashed = resource.whenTrashed()
</ins><span class="cx"> self.assertFalse(trashed is None)
</span><span class="cx">
</span><span class="cx"> # No objects in collection
</span><span class="lines">@@ -208,8 +208,8 @@
</span><span class="cx"> resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
</span><span class="cx"> self.assertEqual(len(resourceNames), 1)
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "calendar", newName)
</span><del>- self.assertFalse((yield resource.isInTrash()))
- trashed = yield resource.whenTrashed()
</del><ins>+ self.assertFalse(resource.isInTrash())
+ trashed = resource.whenTrashed()
</ins><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx">
</span><span class="cx"> # No objects in trash
</span><span class="lines">@@ -322,8 +322,8 @@
</span><span class="cx"> # user01's copy is in the trash, still with user02 accepted
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> resource = yield self._getResource(txn, "user01", trash1.name(), "")
</span><del>- self.assertTrue((yield resource.isInTrash()))
- trashed = yield resource.whenTrashed()
</del><ins>+ self.assertTrue(resource.isInTrash())
+ trashed = resource.whenTrashed()
</ins><span class="cx"> self.assertFalse(trashed is None)
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", trash1.name(), "")
</span><span class="cx"> self.assertTrue("PARTSTAT=ACCEPTED" in data)
</span><span class="lines">@@ -357,8 +357,8 @@
</span><span class="cx">
</span><span class="cx"> # user01's copy should be back on their calendar
</span><span class="cx"> resource = yield self._getResource(txn, "user01", "calendar", "")
</span><del>- self.assertFalse((yield resource.isInTrash()))
- trashed = yield resource.whenTrashed()
</del><ins>+ self.assertFalse(resource.isInTrash())
+ trashed = resource.whenTrashed()
</ins><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "")
</span><span class="cx"> self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</span><span class="lines">@@ -1768,8 +1768,8 @@
</span><span class="cx"> self.assertEquals(len(objects), 0)
</span><span class="cx">
</span><span class="cx"> # Verify it's not in the trash
</span><del>- self.assertFalse((yield resource.isInTrash()))
- trashed = yield resource.whenTrashed()
</del><ins>+ self.assertFalse(resource.isInTrash())
+ trashed = resource.whenTrashed()
</ins><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx">
</span><span class="cx"> collection = yield self._collectionForUser(txn, "user01", "test")
</span></span></pre>
</div>
</div>
</body>
</html>