<!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>[14646] 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/14646">14646</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-01 17:11:49 -0700 (Wed, 01 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't expose trash collection as resource by default; fix sync report for deleted collections; fix home.calendars()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.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>
<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="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14645 => 14646)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-04-01 21:31:16 UTC (rev 14645)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-04-02 00:11:49 UTC (rev 14646)
</span><span class="lines">@@ -578,6 +578,7 @@
</span><span class="cx"> ],
</span><span class="cx">
</span><span class="cx"> "EnableTrashCollection": False, # Enable Trash Collection
</span><ins>+ "ExposeTrashCollection": False, # Expose Trash Collection as a resource
</ins><span class="cx">
</span><span class="cx"> "ParallelUpgrades": False, # Perform upgrades - currently only the
</span><span class="cx"> # database -> filesystem migration - but in
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14645 => 14646)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-04-01 21:31:16 UTC (rev 14645)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-04-02 00:11:49 UTC (rev 14646)
</span><span class="lines">@@ -520,10 +520,9 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def calendars(self, onlyInTrash=False):
</span><del>- if onlyInTrash:
- returnValue([c for c in (yield self.children()) if c.isTrash()])
- else:
- returnValue([c for c in (yield self.children()) if not c.isTrash()])
</del><ins>+ returnValue(
+ [c for c in (yield self.children(onlyInTrash=onlyInTrash))]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14645 => 14646)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-04-01 21:31:16 UTC (rev 14645)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-04-02 00:11:49 UTC (rev 14646)
</span><span class="lines">@@ -2204,6 +2204,9 @@
</span><span class="cx"> """
</span><span class="cx"> results = (yield self._childClass.loadAllObjects(self))
</span><span class="cx"> for result in results:
</span><ins>+ if not config.ExposeTrashCollection:
+ if result.isTrash():
+ continue
</ins><span class="cx"> key = self._childrenKey(result.isInTrash())
</span><span class="cx"> if result.name() not in self._children[key]:
</span><span class="cx"> self._children[key][result.name()] = result
</span><span class="lines">@@ -2324,9 +2327,12 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def getTrash(self, create=False):
</span><span class="cx"> child = None
</span><del>- if hasattr(self, "_trash"):
</del><ins>+ if hasattr(self, "_trashObject"):
+ child = self._trashObject
+ elif hasattr(self, "_trash"):
</ins><span class="cx"> if self._trash:
</span><del>- child = yield self.childWithID(self._trash)
</del><ins>+ child = yield self._childClass.objectWithID(self, self._trash)
+ self._trashObject = child
</ins><span class="cx"> elif create:
</span><span class="cx"> schema = self._homeMetaDataSchema
</span><span class="cx">
</span><span class="lines">@@ -2344,7 +2350,7 @@
</span><span class="cx"> Where=(schema.RESOURCE_ID == self.id()),
</span><span class="cx"> ).on(self._txn))[0][0]
</span><span class="cx"> if self._trash:
</span><del>- child = yield self.childWithID(self._trash)
</del><ins>+ child = yield self._childClass.objectWithID(self, self._trash)
</ins><span class="cx"> else:
</span><span class="cx"> child = yield self._trashClass.create(self, str(uuid4()))
</span><span class="cx"> self._trash = child.id()
</span><span class="lines">@@ -2353,6 +2359,7 @@
</span><span class="cx"> {schema.TRASH: self._trash},
</span><span class="cx"> Where=(schema.RESOURCE_ID == self.id())
</span><span class="cx"> ).on(self._txn)
</span><ins>+ self._trashObject = child
</ins><span class="cx"> returnValue(child)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -3619,9 +3626,11 @@
</span><span class="cx"> yield self._updateIsInTrashQuery.on(
</span><span class="cx"> self._txn, isInTrash=True, trashed=whenTrashed, resourceID=self._resourceID
</span><span class="cx"> )
</span><ins>+ yield self._deletedSyncToken()
+
+ # Rename after calling _deletedSyncToken
</ins><span class="cx"> newName = "{}-{}".format(self._name[:36], str(uuid4()))
</span><span class="cx"> yield self.rename(newName)
</span><del>- yield self._deletedSyncToken()
</del><span class="cx">
</span><span class="cx"> # Update _children cache to reflect moving to trash
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretesttest_trashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_trash.py (14645 => 14646)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-04-01 21:31:16 UTC (rev 14645)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-04-02 00:11:49 UTC (rev 14646)
</span><span class="lines">@@ -2052,3 +2052,45 @@
</span><span class="cx"> result = yield txn.execSQL("select * from calendar_object", [])
</span><span class="cx"> self.assertEquals(len(result), 0)
</span><span class="cx"> yield txn.commit()
</span><ins>+
+
+ @inlineCallbacks
+ def test_trashedCalendars(self):
+
+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
+
+ txn = self.store.newTransaction()
+ home = yield self._homeForUser(txn, "user01")
+ yield home.getTrash(create=True) # force loading trash
+ calendar = yield self._collectionForUser(txn, "user01", "calendar")
+ calendars = yield home.calendars(onlyInTrash=False)
+ self.assertEquals(
+ set([c.name() for c in calendars]),
+ set(["tasks", "inbox", "calendar"]) # trash not there
+ )
+ calendars = yield home.calendars(onlyInTrash=True)
+ self.assertEquals(
+ set([c.name() for c in calendars]),
+ set() # trash not there either
+ )
+ yield txn.commit()
+
+ txn = self.store.newTransaction()
+ calendar = yield self._collectionForUser(txn, "user01", "calendar")
+ resourceID = calendar._resourceID
+ yield calendar.remove()
+ yield txn.commit()
+
+ txn = self.store.newTransaction()
+ home = yield self._homeForUser(txn, "user01")
+ yield home.getTrash(create=True) # force loading trash
+ calendars = yield home.calendars(onlyInTrash=False)
+ self.assertEquals(
+ set([c.name() for c in calendars]),
+ set(["tasks", "inbox"])
+ )
+ calendars = yield home.calendars(onlyInTrash=True)
+ self.assertEquals(len(calendars), 1)
+ self.assertEquals(calendars[0]._resourceID, resourceID)
+ yield txn.commit()
</ins></span></pre>
</div>
</div>
</body>
</html>