<!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>[14186] CalendarServer/branches/users/sagen/trashcan/txdav</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/14186">14186</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 11:51:36 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at the TrashCollection itself</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcommondatastoresql_schemacurrentsql">CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcantxdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcantxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py (14185 => 14186)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py 2014-11-18 19:27:55 UTC (rev 14185)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py 2014-11-20 19:51:36 UTC (rev 14186)
</span><span class="lines">@@ -675,7 +675,9 @@
</span><span class="cx"> inbox = yield self.createCalendarWithName("inbox")
</span><span class="cx"> yield inbox.setUsedForFreeBusy(False)
</span><span class="cx">
</span><ins>+ yield self.createTrash()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def splitCalendars(self):
</span><span class="cx"> """
</span><span class="lines">@@ -5645,10 +5647,62 @@
</span><span class="cx">
</span><span class="cx"> returnValue(location)
</span><span class="cx">
</span><ins>+
+class TrashCollection(Calendar):
+
+ _childType = "trash" # FIXME: make childType an enumeration
+
+
+ @classproperty
+ def _trashInHomeQuery(cls):
+ obj = cls._objectSchema
+ bind = cls._bindSchema
+ return Select(
+ [
+ obj.PARENT_RESOURCE_ID, obj.RESOURCE_ID
+ ],
+ From=obj.join(
+ bind, obj.PARENT_RESOURCE_ID == bind.RESOURCE_ID
+ ),
+ Where=(obj.IS_TRASH == True).And(
+ bind.HOME_RESOURCE_ID == Parameter("resourceID")
+ ).And(
+ bind.BIND_MODE == _BIND_MODE_OWN
+ )
+ )
+
+
+ @inlineCallbacks
+ def listObjectResources(self):
+ """
+ Return a list of names of child object resources in this trash; the
+ list is computed from all the homeChildren in the trash's parent home.
+ """
+ home = self._calendarHome
+
+ results = []
+ rows = (yield self._trashInHomeQuery.on(
+ self._txn, resourceID=home._resourceID
+ ))
+ if rows:
+ for childID, objectID in rows:
+ child = (yield home.childWithID(childID))
+ if child:
+ objectResource = (
+ yield child.objectResourceWithID(objectID)
+ )
+ results.append(objectResource.name())
+
+ returnValue(results)
+
+
+
+
</ins><span class="cx"> # Hook-up class relationships at the end after they have all been defined
</span><span class="cx"> from txdav.caldav.datastore.sql_external import CalendarHomeExternal, CalendarExternal, CalendarObjectExternal
</span><span class="cx"> CalendarHome._externalClass = CalendarHomeExternal
</span><span class="cx"> CalendarHome._childClass = Calendar
</span><ins>+CommonHome._trashClass = TrashCollection
</ins><span class="cx"> Calendar._externalClass = CalendarExternal
</span><span class="cx"> Calendar._objectResourceClass = CalendarObject
</span><span class="cx"> CalendarObject._externalClass = CalendarObjectExternal
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcantxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py (14185 => 14186)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py 2014-11-18 19:27:55 UTC (rev 14185)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py 2014-11-20 19:51:36 UTC (rev 14186)
</span><span class="lines">@@ -2991,6 +2991,7 @@
</span><span class="cx"> _homeMetaDataTable = None
</span><span class="cx"> _externalClass = None
</span><span class="cx"> _childClass = None
</span><ins>+ _trashClass = None
</ins><span class="cx"> _childTable = None
</span><span class="cx"> _notifierPrefix = None
</span><span class="cx">
</span><span class="lines">@@ -3442,7 +3443,11 @@
</span><span class="cx"> @param name: a string.
</span><span class="cx"> @return: an L{ICalendar} or C{None} if no such child exists.
</span><span class="cx"> """
</span><del>- return self._childClass.objectWithName(self, name)
</del><ins>+ # FIXME: should determine the class from the collection_type column
+ if name == "trash":
+ return self._trashClass.objectWithName(self, name)
+ else:
+ return self._childClass.objectWithName(self, name)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def anyObjectWithShareUID(self, shareUID):
</span><span class="lines">@@ -3511,6 +3516,12 @@
</span><span class="cx"> self._children.pop(resourceID, None)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def createTrash(self):
+ child = yield self._trashClass.create(self, "trash")
+ returnValue(child)
+
+
</ins><span class="cx"> @classproperty
</span><span class="cx"> def _syncTokenQuery(cls):
</span><span class="cx"> """
</span><span class="lines">@@ -5521,7 +5532,9 @@
</span><span class="cx"> _revisionsSchema = None
</span><span class="cx"> _objectSchema = None
</span><span class="cx">
</span><ins>+ _childType = None
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @classmethod
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def makeClass(cls, home, bindData, additionalBindData, metadataData, propstore=None, ownerHome=None):
</span><span class="lines">@@ -5814,7 +5827,10 @@
</span><span class="cx"> """
</span><span class="cx"> child = cls._homeChildSchema
</span><span class="cx"> return Insert(
</span><del>- {child.RESOURCE_ID: schema.RESOURCE_ID_SEQ},
</del><ins>+ {
+ child.RESOURCE_ID: schema.RESOURCE_ID_SEQ,
+ child.COLLECTION_TYPE: Parameter("childType"),
+ },
</ins><span class="cx"> Return=(child.RESOURCE_ID)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -5825,8 +5841,12 @@
</span><span class="cx"> DAL statement to create a home child with all default values.
</span><span class="cx"> """
</span><span class="cx"> child = cls._homeChildMetaDataSchema
</span><del>- return Insert({child.RESOURCE_ID: Parameter("resourceID")},
- Return=(child.CREATED, child.MODIFIED))
</del><ins>+ return Insert(
+ {
+ child.RESOURCE_ID: Parameter("resourceID"),
+ },
+ Return=(child.CREATED, child.MODIFIED)
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="lines">@@ -5840,7 +5860,7 @@
</span><span class="cx"> raise HomeChildNameNotAllowedError(name)
</span><span class="cx">
</span><span class="cx"> # Create this object
</span><del>- resourceID = (yield cls._insertHomeChild.on(home._txn))[0][0]
</del><ins>+ resourceID = (yield cls._insertHomeChild.on(home._txn, childType=cls._childType))[0][0]
</ins><span class="cx">
</span><span class="cx"> # Initialize this object
</span><span class="cx"> _created, _modified = (yield cls._insertHomeChildMetaData.on(home._txn, resourceID=resourceID))[0]
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcantxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql (14185 => 14186)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql 2014-11-18 19:27:55 UTC (rev 14185)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql_schema/current.sql 2014-11-20 19:51:36 UTC (rev 14186)
</span><span class="lines">@@ -92,7 +92,8 @@
</span><span class="cx"> --------------
</span><span class="cx">
</span><span class="cx"> create table CALENDAR (
</span><del>- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ') -- implicit index
</del><ins>+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ COLLECTION_TYPE varchar(10) default null -- None, inbox, trash (FIXME: convert this to enumeration)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcantxdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/test/test_sql.py (14185 => 14186)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/test/test_sql.py 2014-11-18 19:27:55 UTC (rev 14185)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/test/test_sql.py 2014-11-20 19:51:36 UTC (rev 14186)
</span><span class="lines">@@ -527,6 +527,7 @@
</span><span class="cx">
</span><span class="cx"> home = yield txn.calendarHomeWithUID("user01", create=True)
</span><span class="cx"> collection = yield home.childWithName("calendar")
</span><ins>+ trash = yield home.childWithName("trash")
</ins><span class="cx">
</span><span class="cx"> # No objects
</span><span class="cx"> objects = yield collection.listObjectResources()
</span><span class="lines">@@ -538,10 +539,14 @@
</span><span class="cx"> Component.allFromString(VCALENDAR_DATA_NO_SCHEDULING)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- # One object
</del><ins>+ # One object in collection
</ins><span class="cx"> objects = yield collection.listObjectResources()
</span><span class="cx"> self.assertEquals(len(objects), 1)
</span><span class="cx">
</span><ins>+ # No objects in trash
+ objects = yield trash.listObjectResources()
+ self.assertEquals(len(objects), 0)
+
</ins><span class="cx"> # Verify it's not in the trash
</span><span class="cx"> self.assertFalse((yield resource.isTrash()))
</span><span class="cx">
</span><span class="lines">@@ -551,21 +556,29 @@
</span><span class="cx"> # Verify it's in the trash
</span><span class="cx"> self.assertTrue((yield resource.isTrash()))
</span><span class="cx">
</span><del>- # No objects
</del><ins>+ # No objects in collection
</ins><span class="cx"> objects = yield collection.listObjectResources()
</span><span class="cx"> self.assertEquals(len(objects), 0)
</span><span class="cx">
</span><ins>+ # One object in trash
+ objects = yield trash.listObjectResources()
+ self.assertEquals(len(objects), 1)
+
</ins><span class="cx"> # Put back from trash
</span><span class="cx"> yield resource.fromTrash()
</span><span class="cx">
</span><span class="cx"> # Not in trash
</span><span class="cx"> self.assertFalse((yield resource.isTrash()))
</span><span class="cx">
</span><del>- # One object
</del><ins>+ # One object in collection
</ins><span class="cx"> objects = yield collection.listObjectResources()
</span><span class="cx"> self.assertEquals(len(objects), 1)
</span><span class="cx">
</span><ins>+ # No objects in trash
+ objects = yield trash.listObjectResources()
+ self.assertEquals(len(objects), 0)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Now with addressbook
</span><span class="cx"> #
</span></span></pre>
</div>
</div>
</body>
</html>