<!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>[14189] 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/14189">14189</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-20 17:59:22 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update revisions table when moving to/from trash</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>
</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 (14188 => 14189)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py        2014-11-20 21:27:51 UTC (rev 14188)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/caldav/datastore/sql.py        2014-11-21 01:59:22 UTC (rev 14189)
</span><span class="lines">@@ -982,6 +982,43 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><ins>+ def makeClass(cls, home, bindData, additionalBindData, metadataData, propstore=None, ownerHome=None):
+ """
+ Examine the calendar metadata to see which flavor of Calendar collection
+ to create, then call the inherited makeClass with the right class.
+
+ @param home: the parent home object
+ @type home: L{CommonHome}
+ @param bindData: the standard set of bind columns
+ @type bindData: C{list}
+ @param additionalBindData: additional bind data specific to sub-classes
+ @type additionalBindData: C{list}
+ @param metadataData: metadata data
+ @type metadataData: C{list}
+ @param propstore: a property store to use, or C{None} to load it automatically
+ @type propstore: L{PropertyStore}
+ @param ownerHome: the home of the owner, or C{None} to figure it out automatically
+ @type ownerHome: L{CommonHome}
+
+ @return: the constructed child class
+ @rtype: L{CommonHomeChild}
+ """
+
+ if metadataData:
+ childType = metadataData[3]
+ if childType == "trash": # FIXME: make this an enumeration
+ actualClass = TrashCollection
+ else:
+ actualClass = cls
+
+ return super(Calendar, actualClass).makeClass(
+ home, bindData, additionalBindData, metadataData,
+ propstore=propstore, ownerHome=ownerHome
+ )
+
+
+
+ @classmethod
</ins><span class="cx"> def metadataColumns(cls):
</span><span class="cx"> """
</span><span class="cx"> Return a list of column name for retrieval of metadata. This allows
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcantxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py (14188 => 14189)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py        2014-11-20 21:27:51 UTC (rev 14188)
+++ CalendarServer/branches/users/sagen/trashcan/txdav/common/datastore/sql.py        2014-11-21 01:59:22 UTC (rev 14189)
</span><span class="lines">@@ -5565,11 +5565,6 @@
</span><span class="cx"> else:
</span><span class="cx"> ownerName = None
</span><span class="cx">
</span><del>- if metadataData:
- collectionType = metadataData[3]
- if collectionType == "trash": # FIXME: make this an enumeration
- cls = home._trashClass
-
</del><span class="cx"> c = cls._externalClass if ownerHome.external() else cls
</span><span class="cx"> child = c(
</span><span class="cx"> home=home,
</span><span class="lines">@@ -7382,6 +7377,10 @@
</span><span class="cx"> self._txn, isTrash=True, resourceID=self._resourceID
</span><span class="cx"> )
</span><span class="cx"> yield self._parentCollection.removedObjectResource(self)
</span><ins>+ trash = yield self._parentCollection._home.childWithName("trash")
+ print("TO TRASH", trash)
+ if trash is not None:
+ yield trash._insertRevision(self._name)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -7390,6 +7389,10 @@
</span><span class="cx"> self._txn, isTrash=False, resourceID=self._resourceID
</span><span class="cx"> )
</span><span class="cx"> yield self._parentCollection.addedObjectResource(self)
</span><ins>+ trash = yield self._parentCollection._home.childWithName("trash")
+ print("FROM TRASH", trash)
+ if trash is not None:
+ yield trash._deleteRevision(self._name)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classproperty
</span></span></pre>
</div>
</div>
</body>
</html>