<!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>[14667] CalendarServer/trunk/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/14667">14667</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 17:32:49 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>When an event moves to the trash, the attachments are not removed. Once an event is fully removed, its attachments are then removed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy">CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14666 => 14667)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-04-08 13:52:06 UTC (rev 14666)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-04-09 00:32:49 UTC (rev 14667)
</span><span class="lines">@@ -4152,11 +4152,6 @@
</span><span class="cx"> if do_implicit_action:
</span><span class="cx"> yield NamedLock.acquire(self._txn, "ImplicitUIDLock:{0}".format(hashlib.md5(calendar.resourceUID()).hexdigest(),))
</span><span class="cx">
</span><del>- # Need to also remove attachments
- if internal_state != ComponentRemoveState.INTERNAL:
- if self._dropboxID:
- yield DropBoxAttachment.resourceRemoved(self._txn, self._resourceID, self._dropboxID)
- yield ManagedAttachment.resourceRemoved(self._txn, self._resourceID)
</del><span class="cx">
</span><span class="cx"> if isinbox:
</span><span class="cx"> bypassTrash = True
</span><span class="lines">@@ -4169,6 +4164,12 @@
</span><span class="cx"> bypassTrash = True
</span><span class="cx">
</span><span class="cx"> if bypassTrash:
</span><ins>+ # Need to also remove attachments
+ if internal_state != ComponentRemoveState.INTERNAL:
+ if self._dropboxID:
+ yield DropBoxAttachment.resourceRemoved(self._txn, self._resourceID, self._dropboxID)
+ yield ManagedAttachment.resourceRemoved(self._txn, self._resourceID)
+
</ins><span class="cx"> yield super(CalendarObject, self).reallyRemove()
</span><span class="cx"> else:
</span><span class="cx"> # Always remove the group attendee link to prevent trashed items from being reconciled when a group changes
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_attachmentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py (14666 => 14667)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2015-04-08 13:52:06 UTC (rev 14666)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2015-04-09 00:32:49 UTC (rev 14667)
</span><span class="lines">@@ -650,6 +650,8 @@
</span><span class="cx"> L{ICalendarObject.remove} will remove an associated calendar
</span><span class="cx"> attachment.
</span><span class="cx"> """
</span><ins>+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
</ins><span class="cx">
</span><span class="cx"> # Create attachment
</span><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><span class="lines">@@ -670,11 +672,25 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertNotEqual(quota, 0)
</span><span class="cx">
</span><del>- # Remove resource
</del><ins>+ # Remove resource (to trash)
</ins><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><span class="cx"> yield obj.remove()
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Attachments still exist and count towards quota
+ self.assertTrue(os.path.exists(apath))
+
+ home = (yield self.transactionUnderTest().calendarHomeWithUID(u"home1"))
+ quota = (yield home.quotaUsedBytes())
+ yield self.commit()
+ self.assertNotEqual(quota, 0)
+
+ # Fully remove resource
+ objects = yield self.trashObjectsUnderTest()
+ yield objects[0].remove(bypassTrash=True)
+ yield self.commit()
+
+ # Attachments don't exist and will not count towards quota
</ins><span class="cx"> self.assertFalse(os.path.exists(apath))
</span><span class="cx">
</span><span class="cx"> home = (yield self.transactionUnderTest().calendarHomeWithUID(u"home1"))
</span><span class="lines">@@ -689,6 +705,8 @@
</span><span class="cx"> L{ICalendarObject.remove} will remove all associated calendar
</span><span class="cx"> attachments.
</span><span class="cx"> """
</span><ins>+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
</ins><span class="cx">
</span><span class="cx"> # Create attachment
</span><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><span class="lines">@@ -723,7 +741,7 @@
</span><span class="cx">
</span><span class="cx"> # Remove resource
</span><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><del>- yield obj.remove()
</del><ins>+ yield obj.remove(bypassTrash=True)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> self.assertFalse(os.path.exists(apath1))
</span><span class="lines">@@ -1261,6 +1279,8 @@
</span><span class="cx"> L{ICalendarObject.remove} will remove an associated calendar
</span><span class="cx"> attachment.
</span><span class="cx"> """
</span><ins>+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
</ins><span class="cx">
</span><span class="cx"> # Create attachment
</span><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><span class="lines">@@ -1279,11 +1299,25 @@
</span><span class="cx"> yield self.commit()
</span><span class="cx"> self.assertNotEqual(quota, 0)
</span><span class="cx">
</span><del>- # Remove resource
</del><ins>+ # Remove resource (to trash)
</ins><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><span class="cx"> yield obj.remove()
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><ins>+ # Attachments still exist and count towards quota
+ self.assertTrue(os.path.exists(apath))
+
+ home = (yield self.transactionUnderTest().calendarHomeWithUID(u"home1"))
+ quota = (yield home.quotaUsedBytes())
+ yield self.commit()
+ self.assertNotEqual(quota, 0)
+
+ # Fully remove resource
+ objects = yield self.trashObjectsUnderTest()
+ yield objects[0].remove(bypassTrash=True)
+ yield self.commit()
+
+ # Attachments don't exist and will not count towards quota
</ins><span class="cx"> self.assertFalse(os.path.exists(apath))
</span><span class="cx">
</span><span class="cx"> home = (yield self.transactionUnderTest().calendarHomeWithUID(u"home1"))
</span><span class="lines">@@ -1328,7 +1362,7 @@
</span><span class="cx">
</span><span class="cx"> # Remove resource
</span><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><del>- yield obj.remove()
</del><ins>+ yield obj.remove(bypassTrash=True)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> self.assertFalse(os.path.exists(apath1))
</span><span class="lines">@@ -1368,7 +1402,7 @@
</span><span class="cx">
</span><span class="cx"> # Remove resource
</span><span class="cx"> obj = yield self.calendarObjectUnderTest()
</span><del>- yield obj.remove()
</del><ins>+ yield obj.remove(bypassTrash=True)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> self.assertTrue(os.path.exists(apath))
</span><span class="lines">@@ -1380,7 +1414,7 @@
</span><span class="cx">
</span><span class="cx"> # Remove resource
</span><span class="cx"> obj = yield self.calendarObjectUnderTest(name="test.ics")
</span><del>- yield obj.remove()
</del><ins>+ yield obj.remove(bypassTrash=True)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> self.assertFalse(os.path.exists(apath))
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14666 => 14667)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-04-08 13:52:06 UTC (rev 14666)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-04-09 00:32:49 UTC (rev 14667)
</span><span class="lines">@@ -2934,7 +2934,9 @@
</span><span class="cx"> trash = yield self.getTrash()
</span><span class="cx"> if trash is None:
</span><span class="cx"> if verbose:
</span><del>- print("No trash collection for principal")
</del><ins>+ msg = "No trash collection for principal"
+ print(msg)
+ log.info(msg)
</ins><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx"> endTime = datetime.datetime.utcnow() - datetime.timedelta(days=days)
</span><span class="lines">@@ -2949,12 +2951,16 @@
</span><span class="cx"> continue
</span><span class="cx">
</span><span class="cx"> if verbose:
</span><del>- print("Collection \"{}\":".format(displayName.encode("utf-8")))
</del><ins>+ msg = "Collection \"{}\":".format(displayName.encode("utf-8"))
+ print(msg)
+ log.info(msg)
</ins><span class="cx"> for child in children:
</span><del>- component = yield child.component()
- summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
</del><span class="cx"> if verbose:
</span><del>- print(" Removing \"{}\"...".format(summary))
</del><ins>+ component = yield child.component()
+ summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
+ msg = " Removing \"{}\"...".format(summary)
+ print(msg)
+ log.info(msg)
</ins><span class="cx"> yield child.reallyRemove()
</span><span class="cx"> if verbose:
</span><span class="cx"> print("")
</span><span class="lines">@@ -2966,19 +2972,25 @@
</span><span class="cx"> collection._resourceID, end=endTime
</span><span class="cx"> )
</span><span class="cx"> if verbose:
</span><del>- print("Collection \"{}\":".format(displayName.encode("utf-8")))
</del><ins>+ msg = "Collection \"{}\":".format(displayName.encode("utf-8"))
+ print(msg)
+ log.info(msg)
</ins><span class="cx"> for child in children:
</span><del>- component = yield child.component()
- summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
</del><span class="cx"> if verbose:
</span><del>- print(" Removing \"{}\"...".format(summary))
</del><ins>+ component = yield child.component()
+ summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
+ msg = " Removing \"{}\"...".format(summary)
+ print(msg)
+ log.info(msg)
</ins><span class="cx"> yield child.reallyRemove()
</span><span class="cx"> if verbose:
</span><span class="cx"> print("")
</span><span class="cx">
</span><span class="cx"> if collection.whenTrashed() < endTime:
</span><span class="cx"> if verbose:
</span><del>- print("Removing collection \"{}\"...".format(displayName.encode("utf-8")))
</del><ins>+ msg = "Removing collection \"{}\"...".format(displayName.encode("utf-8"))
+ print(msg)
+ log.info(msg)
</ins><span class="cx"> yield collection.reallyRemove()
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (14666 => 14667)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-04-08 13:52:06 UTC (rev 14666)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py 2015-04-09 00:32:49 UTC (rev 14667)
</span><span class="lines">@@ -995,6 +995,20 @@
</span><span class="cx"> returnValue(object)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def trashObjectsUnderTest(
+ self, txn=None, home="home1", status=None
+ ):
+ """
+ Get the calendar detailed by
+ C{requirements[home][calendar_name][name]}.
+ """
+ home = yield self.homeUnderTest(name=home)
+ trash = yield home.getTrash()
+ objects = yield trash.objectResources()
+ returnValue(objects)
+
+
</ins><span class="cx"> def addressbookHomeUnderTest(self, txn=None, name="home1"):
</span><span class="cx"> """
</span><span class="cx"> Get the addressbook home detailed by C{requirements['home1']}.
</span></span></pre>
</div>
</div>
</body>
</html>