<!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>[14485] 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/14485">14485</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 13:28:03 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>isTrash -> isInTrash</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5calendarservertoolstrashpy">CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingprocessingpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresql_schemacurrentsql">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan5calendarservertoolstrashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py (14484 => 14485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py 2015-02-27 20:43:08 UTC (rev 14484)
+++ CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py 2015-02-27 21:28:03 UTC (rev 14485)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> if cobj is not None:
</span><span class="cx"> # If it's still in the trash, restore it from trash
</span><del>- if (yield cobj.isTrash()):
</del><ins>+ if (yield cobj.isInTrash()):
</ins><span class="cx"> print("Restoring:", name)
</span><span class="cx"> yield cobj.fromTrash()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py (14484 => 14485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py 2015-02-27 20:43:08 UTC (rev 14484)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/processing.py 2015-02-27 21:28:03 UTC (rev 14485)
</span><span class="lines">@@ -519,8 +519,8 @@
</span><span class="cx"> log.debug("ImplicitProcessing - originator '%s' to recipient '%s' processing METHOD:REQUEST, UID: '%s' - updating event" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><span class="cx">
</span><span class="cx"> # Only move from trash if attendee is not fully declined:
</span><del>- isTrash = yield self.recipient_calendar_resource.isTrash()
- if isTrash:
</del><ins>+ isInTrash = yield self.recipient_calendar_resource.isInTrash()
+ if isInTrash:
</ins><span class="cx"> attendees = self.message.getAttendeeProperties((self.recipient.cuaddr,))
</span><span class="cx"> if not all([attendee.parameterValue("PARTSTAT", "NEEDS-ACTION") == "DECLINED" for attendee in attendees]):
</span><span class="cx"> yield self.recipient_calendar_resource.fromTrash()
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py (14484 => 14485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-02-27 20:43:08 UTC (rev 14484)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-02-27 21:28:03 UTC (rev 14485)
</span><span class="lines">@@ -2362,7 +2362,7 @@
</span><span class="cx"> obj.MODIFIED,
</span><span class="cx"> obj.DATAVERSION,
</span><span class="cx"> obj.TRASHED,
</span><del>- obj.IS_TRASH,
</del><ins>+ obj.IS_IN_TRASH,
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2385,7 +2385,7 @@
</span><span class="cx"> "_modified",
</span><span class="cx"> "_dataversion",
</span><span class="cx"> "_trashed",
</span><del>- "_is_trash",
</del><ins>+ "_is_in_trash",
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -5880,7 +5880,7 @@
</span><span class="cx"> From=obj.join(
</span><span class="cx"> bind, obj.PARENT_RESOURCE_ID == bind.RESOURCE_ID
</span><span class="cx"> ),
</span><del>- Where=(obj.IS_TRASH == True).And(
</del><ins>+ Where=(obj.IS_IN_TRASH == True).And(
</ins><span class="cx"> bind.HOME_RESOURCE_ID == Parameter("resourceID")
</span><span class="cx"> ).And(
</span><span class="cx"> bind.BIND_MODE == _BIND_MODE_OWN
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py (14484 => 14485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-02-27 20:43:08 UTC (rev 14484)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-02-27 21:28:03 UTC (rev 14485)
</span><span class="lines">@@ -6093,7 +6093,22 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def remove(self):
</span><ins>+ """
+ Just moves the collection to the trash
+ """
</ins><span class="cx">
</span><ins>+ if config.EnableTrashCollection:
+ if self.isInTrash():
+ raise AlreadyInTrashError
+ else:
+ yield self.toTrash()
+ else:
+ yield self.reallyRemove()
+
+
+ @inlineCallbacks
+ def reallyRemove(self):
+
</ins><span class="cx"> # Stop sharing first
</span><span class="cx"> yield self.ownerDeleteShare()
</span><span class="cx">
</span><span class="lines">@@ -6178,7 +6193,7 @@
</span><span class="cx"> def listObjectResources(self):
</span><span class="cx"> """
</span><span class="cx"> Returns a list of names of object resources in this collection, taking
</span><del>- into account the IS_TRASH flag and skipping those in the trash.
</del><ins>+ into account the IS_IN_TRASH flag and skipping those in the trash.
</ins><span class="cx"> """
</span><span class="cx"> if self._objectNames is None:
</span><span class="cx"> self._objectNames = yield self._objectResourceClass.listObjects(self)
</span><span class="lines">@@ -7015,7 +7030,7 @@
</span><span class="cx"> rows = yield Select(
</span><span class="cx"> [obj.RESOURCE_NAME],
</span><span class="cx"> From=obj,
</span><del>- Where=(obj.PARENT_RESOURCE_ID == Parameter('parentID')).And(obj.IS_TRASH == False)
</del><ins>+ Where=(obj.PARENT_RESOURCE_ID == Parameter('parentID')).And(obj.IS_IN_TRASH == False)
</ins><span class="cx"> ).on(parent._txn, parentID=parent.id())
</span><span class="cx"> returnValue(sorted([row[0] for row in rows]))
</span><span class="cx">
</span><span class="lines">@@ -7495,18 +7510,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classproperty
</span><del>- def _updateIsTrashQuery(cls):
</del><ins>+ def _updateIsInTrashQuery(cls):
</ins><span class="cx"> obj = cls._objectSchema
</span><span class="cx"> return Update(
</span><del>- {obj.IS_TRASH: Parameter("isTrash"), obj.TRASHED: Parameter("trashed")},
</del><ins>+ {obj.IS_IN_TRASH: Parameter("isInTrash"), obj.TRASHED: Parameter("trashed")},
</ins><span class="cx"> Where=obj.RESOURCE_ID == Parameter("resourceID"),
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def toTrash(self):
</span><del>- yield self._updateIsTrashQuery.on(
- self._txn, isTrash=True, trashed=datetime.datetime.utcnow(), resourceID=self._resourceID
</del><ins>+ yield self._updateIsInTrashQuery.on(
+ self._txn, isInTrash=True, trashed=datetime.datetime.utcnow(), resourceID=self._resourceID
</ins><span class="cx"> )
</span><span class="cx"> yield self._parentCollection.removedObjectResource(self)
</span><span class="cx"> yield self._parentCollection._deleteRevision(self.name())
</span><span class="lines">@@ -7525,8 +7540,8 @@
</span><span class="cx"> def fromTrash(self):
</span><span class="cx">
</span><span class="cx"> # First make sure this is actually in the trash
</span><del>- isTrash = yield self.isTrash()
- if not isTrash:
</del><ins>+ isInTrash = yield self.isInTrash()
+ if not isInTrash:
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> if self._parentCollection.isTrash():
</span><span class="lines">@@ -7543,8 +7558,8 @@
</span><span class="cx"> trashedName = trash.nameForResource(self._parentCollection, self)
</span><span class="cx"> newName = self._name
</span><span class="cx">
</span><del>- yield self._updateIsTrashQuery.on(
- self._txn, isTrash=False, trashed=None, resourceID=self._resourceID
</del><ins>+ yield self._updateIsInTrashQuery.on(
+ self._txn, isInTrash=False, trashed=None, resourceID=self._resourceID
</ins><span class="cx"> )
</span><span class="cx"> yield trash._deleteRevision(trashedName)
</span><span class="cx">
</span><span class="lines">@@ -7559,11 +7574,11 @@
</span><span class="cx"> @classproperty
</span><span class="cx"> def _selectIsTrashQuery(cls):
</span><span class="cx"> obj = cls._objectSchema
</span><del>- return Select((obj.IS_TRASH, obj.TRASHED), From=obj, Where=obj.RESOURCE_ID == Parameter("resourceID"))
</del><ins>+ return Select((obj.IS_IN_TRASH, obj.TRASHED), From=obj, Where=obj.RESOURCE_ID == Parameter("resourceID"))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def isTrash(self):
</del><ins>+ def isInTrash(self):
</ins><span class="cx"> returnValue(
</span><span class="cx"> (
</span><span class="cx"> yield self._selectIsTrashQuery.on(
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_schema/current.sql (14484 => 14485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_schema/current.sql 2015-02-27 20:43:08 UTC (rev 14484)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_schema/current.sql 2015-02-27 21:28:03 UTC (rev 14485)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> CHILD_TYPE varchar(10) default null, -- None, inbox, trash (FIXME: convert this to enumeration)
</span><span class="cx"> TRASHED timestamp default null,
</span><del>- IS_TRASH boolean default false not null -- collection is in the trash
</del><ins>+ IS_IN_TRASH boolean default false not null -- collection is in the trash
</ins><span class="cx">
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><span class="cx"> TRASHED timestamp default null,
</span><del>- IS_TRASH boolean default false not null, -- entire resource is in the trash
</del><ins>+ IS_IN_TRASH boolean default false not null, -- entire resource is in the trash
</ins><span class="cx">
</span><span class="cx"> unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</span><span class="cx">
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><span class="cx"> TRASHED timestamp default null,
</span><del>- IS_TRASH boolean default false not null,
</del><ins>+ IS_IN_TRASH boolean default false not null,
</ins><span class="cx">
</span><span class="cx"> unique (ADDRESSBOOK_HOME_RESOURCE_ID, RESOURCE_NAME), -- implicit index
</span><span class="cx"> unique (ADDRESSBOOK_HOME_RESOURCE_ID, VCARD_UID) -- implicit index
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py (14484 => 14485)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-27 20:43:08 UTC (rev 14484)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/test/test_sql.py 2015-02-27 21:28:03 UTC (rev 14485)
</span><span class="lines">@@ -632,7 +632,7 @@
</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.isTrash()))
</del><ins>+ self.assertFalse((yield resource.isInTrash()))
</ins><span class="cx"> trashed = yield resource.whenTrashed()
</span><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx">
</span><span class="lines">@@ -646,7 +646,7 @@
</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", "")
</span><del>- self.assertTrue((yield resource.isTrash()))
</del><ins>+ self.assertTrue((yield resource.isInTrash()))
</ins><span class="cx"> trashed = yield resource.whenTrashed()
</span><span class="cx"> self.assertFalse(trashed is None)
</span><span class="cx">
</span><span class="lines">@@ -675,7 +675,7 @@
</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", "test.ics")
</span><del>- self.assertFalse((yield resource.isTrash()))
</del><ins>+ self.assertFalse((yield resource.isInTrash()))
</ins><span class="cx"> trashed = yield resource.whenTrashed()
</span><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx">
</span><span class="lines">@@ -719,13 +719,13 @@
</span><span class="cx"> # self.assertEquals(len(objects), 1)
</span><span class="cx">
</span><span class="cx"> # # Verify it's not in the trash
</span><del>-# self.assertFalse((yield resource.isTrash()))
</del><ins>+# self.assertFalse((yield resource.isInTrash()))
</ins><span class="cx">
</span><span class="cx"> # # Move object to trash
</span><span class="cx"> # yield resource.toTrash()
</span><span class="cx">
</span><span class="cx"> # # Verify it's in the trash
</span><del>-# self.assertTrue((yield resource.isTrash()))
</del><ins>+# self.assertTrue((yield resource.isInTrash()))
</ins><span class="cx">
</span><span class="cx"> # # No objects
</span><span class="cx"> # objects = yield collection.listObjectResources()
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx"> # yield resource.fromTrash()
</span><span class="cx">
</span><span class="cx"> # # Not in trash
</span><del>-# self.assertFalse((yield resource.isTrash()))
</del><ins>+# self.assertFalse((yield resource.isInTrash()))
</ins><span class="cx">
</span><span class="cx"> # # One object
</span><span class="cx"> # objects = yield collection.listObjectResources()
</span><span class="lines">@@ -854,7 +854,7 @@
</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", "trash", "")
</span><del>- self.assertTrue((yield resource.isTrash()))
</del><ins>+ self.assertTrue((yield resource.isInTrash()))
</ins><span class="cx"> trashed = yield resource.whenTrashed()
</span><span class="cx"> self.assertFalse(trashed is None)
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "trash", "")
</span><span class="lines">@@ -888,7 +888,7 @@
</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", "test.ics")
</span><del>- self.assertFalse((yield resource.isTrash()))
</del><ins>+ self.assertFalse((yield resource.isInTrash()))
</ins><span class="cx"> trashed = yield resource.whenTrashed()
</span><span class="cx"> self.assertTrue(trashed is None)
</span><span class="cx"> data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
</span></span></pre>
</div>
</div>
</body>
</html>