<!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>[14525] 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/14525">14525</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 17:03:31 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unshare when deleting collection</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="#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>
</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 (14524 => 14525)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py 2015-03-06 23:57:26 UTC (rev 14524)
+++ CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py 2015-03-07 01:03:31 UTC (rev 14525)
</span><span class="lines">@@ -156,7 +156,6 @@
</span><span class="cx"> print("No untrashed collections for:", prettyRecord(record))
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><del>- # print("Listing trashed collections for:", prettyRecord(record))
</del><span class="cx"> for collection in untrashedCollections:
</span><span class="cx"> displayName = displayNameForCollection(collection)
</span><span class="cx"> children = yield trash.trashForCollection(collection._resourceID)
</span><span class="lines">@@ -254,7 +253,6 @@
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> endTime = datetime.datetime.utcnow() - datetime.timedelta(days=-days)
</span><del>- # print("Listing trashed collections for:", prettyRecord(record))
</del><span class="cx"> for collection in untrashedCollections:
</span><span class="cx"> displayName = displayNameForCollection(collection)
</span><span class="cx"> children = yield trash.trashForCollection(
</span><span class="lines">@@ -278,34 +276,8 @@
</span><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><del>-# @inlineCallbacks
-# def restoreFromTrash(store, directory, root, principals):
</del><span class="cx">
</span><del>-# for principalUID in principals:
-# txn = store.newTransaction(label="Restore trashed events")
-# home = yield txn.calendarHomeWithUID(principalUID)
-# if home is None:
-# continue
-# trashedCollections = yield home.children(onlyInTrash=True)
-# for collection in trashedCollections:
-# displayName = displayNameForCollection(collection)
-# print("Restoring collection", displayName, collection._resourceID)
-# yield collection.fromTrash(restoreChildren=True)
-# # This code is for untrashing all objects:
-# # names = yield trash.listObjectResources()
-# # for name in names:
-# # cobj = yield trash.calendarObjectWithName(name)
-# # print(name, cobj)
</del><span class="cx">
</span><del>-# # if cobj is not None:
-# # # If it's still in the trash, restore it from trash
-# # if (yield cobj.isInTrash()):
-# # print("Restoring:", name)
-# # yield cobj.fromTrash()
-
-# yield txn.commit()
-
-
</del><span class="cx"> def displayNameForCollection(collection):
</span><span class="cx"> try:
</span><span class="cx"> displayName = collection.properties()[
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py (14524 => 14525)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-03-06 23:57:26 UTC (rev 14524)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-03-07 01:03:31 UTC (rev 14525)
</span><span class="lines">@@ -5906,7 +5906,8 @@
</span><span class="cx"> resources = []
</span><span class="cx"> for (objectResourceID,) in results:
</span><span class="cx"> resource = yield self.objectResourceWithID(objectResourceID)
</span><del>- resources.append(resource)
</del><ins>+ if resource is not None:
+ resources.append(resource)
</ins><span class="cx"> returnValue(resources)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py (14524 => 14525)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-03-06 23:57:26 UTC (rev 14524)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-03-07 01:03:31 UTC (rev 14525)
</span><span class="lines">@@ -6162,6 +6162,8 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def toTrash(self):
</span><span class="cx"> # print("XYZZY collection toTrash")
</span><ins>+ yield self.ownerDeleteShare()
+
</ins><span class="cx"> for resource in (yield self.objectResources()):
</span><span class="cx"> yield resource.toTrash()
</span><span class="cx"> whenTrashed = datetime.datetime.utcnow()
</span><span class="lines">@@ -7661,6 +7663,8 @@
</span><span class="cx"> originalCollection = self._parentCollection._resourceID
</span><span class="cx"> trash = yield self._parentCollection._home.childWithName("trash")
</span><span class="cx"> newName = str(uuid4())
</span><ins>+ # FIXME: if the sharee is deleting this resource, it needs to move to
+ # the sharer's trash instead
</ins><span class="cx"> yield self.moveTo(trash, name=newName)
</span><span class="cx"> yield self._updateToTrashQuery.on(
</span><span class="cx"> self._txn, originalCollection=originalCollection, trashed=datetime.datetime.utcnow(), resourceID=self._resourceID
</span></span></pre>
</div>
</div>
</body>
</html>