<!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>[14515] CalendarServer/branches/users/sagen/trashcan-5/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/14515">14515</a></dd>

<dt>Author</dt> <dd>sagen@apple.com</dd>

<dt>Date</dt> <dd>2015-03-05 14:11:06 -0800 (Thu, 05 Mar 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Trashed events now belong to the trash collection, with a reference to the original parent; collections can move to and from trash</pre>

<h3>Modified Paths</h3>

<ul>

<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="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy"></a>

<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py (14514 => 14515)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py        2015-03-05 21:26:24 UTC (rev 14514)

+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py        2015-03-05 22:11:06 UTC (rev 14515)

</span><span class="lines">@@ -1045,6 +1045,8 @@

</span><span class="cx">             cls._homeChildMetaDataSchema.CREATED,

</span><span class="cx">             cls._homeChildMetaDataSchema.MODIFIED,

</span><span class="cx">             cls._homeChildMetaDataSchema.CHILD_TYPE,

</span><ins>+            cls._homeChildMetaDataSchema.TRASHED,

+            cls._homeChildMetaDataSchema.IS_IN_TRASH,

</ins><span class="cx">         )

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="lines">@@ -1063,6 +1065,8 @@

</span><span class="cx">             &quot;_created&quot;,

</span><span class="cx">             &quot;_modified&quot;,

</span><span class="cx">             &quot;_childType&quot;,

</span><ins>+            &quot;_trashed&quot;,

+            &quot;_isInTrash&quot;,

</ins><span class="cx">         )

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="lines">@@ -2362,7 +2366,7 @@

</span><span class="cx">             obj.MODIFIED,

</span><span class="cx">             obj.DATAVERSION,

</span><span class="cx">             obj.TRASHED,

</span><del>-            obj.IS_IN_TRASH,

</del><ins>+            obj.ORIGINAL_COLLECTION,

</ins><span class="cx">         ]

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="lines">@@ -2385,7 +2389,7 @@

</span><span class="cx">             &quot;_modified&quot;,

</span><span class="cx">             &quot;_dataversion&quot;,

</span><span class="cx">             &quot;_trashed&quot;,

</span><del>-            &quot;_is_in_trash&quot;,

</del><ins>+            &quot;_original_collection&quot;,

</ins><span class="cx">         )

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="lines">@@ -4908,7 +4912,7 @@

</span><span class="cx"> 

</span><span class="cx">     @inlineCallbacks

</span><span class="cx">     def fromTrash(self):

</span><del>-        yield super(CalendarObject, self).fromTrash()

</del><ins>+        name = yield super(CalendarObject, self).fromTrash()

</ins><span class="cx"> 

</span><span class="cx">         caldata = yield self.componentForUser()

</span><span class="cx">         organizer = caldata.getOrganizer()

</span><span class="lines">@@ -4967,8 +4971,10 @@

</span><span class="cx">                     self

</span><span class="cx">                 )

</span><span class="cx"> 

</span><ins>+        returnValue(name)

</ins><span class="cx"> 

</span><span class="cx"> 

</span><ins>+

</ins><span class="cx"> class AttachmentStorageTransport(StorageTransportBase):

</span><span class="cx"> 

</span><span class="cx">     _TEMPORARY_UPLOADS_DIRECTORY = &quot;Temporary&quot;

</span><span class="lines">@@ -5868,67 +5874,44 @@

</span><span class="cx"> 

</span><span class="cx">     _childType = &quot;trash&quot;  # FIXME: make childType an enumeration

</span><span class="cx"> 

</span><ins>+    def isTrash(self):

+        return True

</ins><span class="cx"> 

</span><ins>+

</ins><span class="cx">     @classproperty

</span><del>-    def _trashInHomeQuery(cls):

</del><ins>+    def _trashForCollectionQuery(cls):

</ins><span class="cx">         obj = cls._objectSchema

</span><del>-        bind = cls._bindSchema

</del><span class="cx">         return Select(

</span><del>-            [

-                obj.PARENT_RESOURCE_ID, obj.RESOURCE_ID

-            ],

-            From=obj.join(

-                bind, obj.PARENT_RESOURCE_ID == bind.RESOURCE_ID

-            ),

-            Where=(obj.IS_IN_TRASH == True).And(

-                bind.HOME_RESOURCE_ID == Parameter(&quot;resourceID&quot;)

-            ).And(

-                bind.BIND_MODE == _BIND_MODE_OWN

-            )

</del><ins>+            [obj.RESOURCE_ID], From=obj,

+            Where=(

+                obj.ORIGINAL_COLLECTION == Parameter(&quot;resourceID&quot;)).And(

+                obj.TRASHED &gt;= Parameter(&quot;start&quot;)).And(

+                obj.TRASHED &lt;= Parameter(&quot;end&quot;)),

</ins><span class="cx">         )

</span><span class="cx"> 

</span><span class="cx"> 

</span><del>-    def isTrash(self):

-        return True

</del><ins>+    @inlineCallbacks

+    def trashForCollection(self, resourceID, start=None, end=None):

</ins><span class="cx"> 

</span><ins>+        if start is None:

+            start = datetime.datetime(datetime.MINYEAR, 1, 1)

</ins><span class="cx"> 

</span><del>-    def nameForResource(self, collection, objectResource):

-        return &quot;{}-{}&quot;.format(collection._resourceID, objectResource.name())

</del><ins>+        if end is None:

+            end = datetime.datetime.utcnow()

</ins><span class="cx"> 

</span><del>-    def originalParentForResource(self, objectResource):

-        parentID, resourceName = self.parseName(objectResource._name)

-        return self._home.childWithID(parentID)

</del><ins>+        results = yield self._trashForCollectionQuery.on(

+            self._txn, resourceID=resourceID, start=start, end=end

+        )

+        resources = []

+        for (objectResourceID,) in results:

+            resource = yield self.objectResourceWithID(objectResourceID)

+            resources.append(resource)

+        returnValue(resources)

</ins><span class="cx"> 

</span><del>-    def parseName(self, name):

-        parentID, resourceName = name.split(&quot;-&quot;, 1)

-        return int(parentID), resourceName

</del><span class="cx"> 

</span><span class="cx"> 

</span><del>-    @inlineCallbacks

-    def listObjectResources(self):

-        &quot;&quot;&quot;

-        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.

-        &quot;&quot;&quot;

-        home = self._calendarHome

</del><span class="cx"> 

</span><del>-        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(self.nameForResource(child, objectResource))

</del><span class="cx"> 

</span><del>-        returnValue(results)

-

-

-

</del><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></pre></div>

<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy"></a>

<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py (14514 => 14515)</h4>

<pre class="diff"><span>

<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py        2015-03-05 21:26:24 UTC (rev 14514)

+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py        2015-03-05 22:11:06 UTC (rev 14515)

</span><span class="lines">@@ -87,7 +87,7 @@

</span><span class="cx"> 

</span><span class="cx"> from zope.interface import implements, directlyProvides

</span><span class="cx"> 

</span><del>-from collections import namedtuple

</del><ins>+from collections import namedtuple, defaultdict

</ins><span class="cx"> import datetime

</span><span class="cx"> import inspect

</span><span class="cx"> import itertools

</span><span class="lines">@@ -3033,7 +3033,7 @@

</span><span class="cx">         self._status = _HOME_STATUS_NORMAL

</span><span class="cx">         self._dataVersion = None

</span><span class="cx">         self._childrenLoaded = False

</span><del>-        self._children = {}

</del><ins>+        self._children = defaultdict(dict)

</ins><span class="cx">         self._notifiers = None

</span><span class="cx">         self._quotaUsedBytes = None

</span><span class="cx">         self._created = None

</span><span class="lines">@@ -3425,17 +3425,21 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx">     @inlineCallbacks

</span><del>-    def children(self):

</del><ins>+    def children(self, onlyInTrash=False):

</ins><span class="cx">         &quot;&quot;&quot;

<span class="cx">         Retrieve children contained in this home.

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         x = []

</span><del>-        names = yield self.listChildren()

</del><ins>+        names = yield self.listChildren(onlyInTrash=onlyInTrash)

</ins><span class="cx">         for name in names:

</span><del>-            x.append((yield self.childWithName(name)))

</del><ins>+            x.append((yield self.childWithName(name, onlyInTrash=onlyInTrash)))

</ins><span class="cx">         returnValue(x)

</span><span class="cx"> 

</span><span class="cx"> 

</span><ins>+    def _childrenKey(self, onlyInTrash):

+        return &quot;TRASHED&quot; if onlyInTrash else &quot;NOTTRASHED&quot;

+

+

</ins><span class="cx">     @inlineCallbacks

</span><span class="cx">     def loadChildren(self):

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="lines">@@ -3443,27 +3447,29 @@

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         results = (yield self._childClass.loadAllObjects(self))

</span><span class="cx">         for result in results:

</span><del>-            self._children[result.name()] = result

-            self._children[result._resourceID] = result

</del><ins>+            key = self._childrenKey(result.isInTrash())

+            self._children[key][result.name()] = result

+            self._children[key][result._resourceID] = result

</ins><span class="cx">         self._childrenLoaded = True

</span><span class="cx">         returnValue(results)

</span><span class="cx"> 

</span><span class="cx"> 

</span><del>-    def listChildren(self):

</del><ins>+    @inlineCallbacks

+    def listChildren(self, onlyInTrash=False):

</ins><span class="cx">         &quot;&quot;&quot;

<span class="cx">         Retrieve the names of the children in this home.

</span><span class="cx"> 

<span class="cx">         @return: an iterable of C{str}s.

</span><span class="cx">         &quot;&quot;&quot;

</span><span class="cx"> 

</span><del>-        if self._childrenLoaded:

-            return succeed([k for k in self._children.keys() if isinstance(k, str)])

-        else:

-            return self._childClass.listObjects(self)

</del><ins>+        if not self._childrenLoaded:

+            yield self.loadChildren()

+        names = [k for k in self._children[self._childrenKey(onlyInTrash)].keys() if isinstance(k, str)]

+        returnValue(names)

</ins><span class="cx"> 

</span><span class="cx"> 

</span><del>-    @memoizedKey(&quot;name&quot;, &quot;_children&quot;)

-    def childWithName(self, name):

</del><ins>+    @inlineCallbacks

+    def childWithName(self, name, onlyInTrash=False):

</ins><span class="cx">         &quot;&quot;&quot;

</span><span class="cx">         Retrieve the child with the given C{name} contained in this

<span class="cx">         home.

</span><span class="lines">@@ -3471,10 +3477,15 @@