<!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>[14484] 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/14484">14484</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 12:43:08 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds basic trash restore cmd line tool; fix problem where trash revision was not properly deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5calendarservertoolstrashpy">CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan5calendarservertoolstrashpy"></a>
<div class="addfile"><h4>Added: CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py (0 => 14484)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py (rev 0)
+++ CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py 2015-02-27 20:43:08 UTC (rev 14484)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+#!/usr/bin/env python
+# -*- test-case-name: calendarserver.tools.test.test_trash -*-
+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+from __future__ import print_function
+
+import collections
+import datetime
+from getopt import getopt, GetoptError
+import os
+import sys
+
+from calendarserver.tools import tables
+from calendarserver.tools.cmdline import utilityMain, WorkerService
+
+from pycalendar.datetime import DateTime
+
+from twext.enterprise.dal.record import fromTable
+from twext.enterprise.dal.syntax import Delete, Select, Union
+from twext.enterprise.jobqueue import WorkItem, RegeneratingWorkItem
+from twext.python.log import Logger
+
+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
+
+from twistedcaldav import caldavxml
+from twistedcaldav.config import config
+
+from txdav.caldav.datastore.query.filter import Filter
+from txdav.common.datastore.sql_tables import schema, _HOME_STATUS_NORMAL
+from txdav.caldav.datastore.sql import CalendarStoreFeatures
+
+from argparse import ArgumentParser
+
+
+log = Logger()
+
+
+
+class TrashRestorationService(WorkerService):
+
+ principals = []
+
+ def doWork(self):
+ rootResource = self.rootResource()
+ directory = rootResource.getDirectory()
+ return restoreFromTrash(
+ self.store, directory, rootResource, self.principals
+ )
+
+
+
+def main():
+
+ parser = ArgumentParser(description='Restore events from trash')
+ parser.add_argument('-f', '--config', dest='configFileName', metavar='CONFIGFILE', help='caldavd.plist configuration file path')
+ parser.add_argument('-d', '--debug', action='store_true', help='show debug logging')
+ parser.add_argument('principal', help='one or more principals to restore', nargs='+') # Required
+ args = parser.parse_args()
+
+ TrashRestorationService.principals = args.principal
+
+ utilityMain(
+ args.configFileName,
+ TrashRestorationService,
+ verbose=args.debug,
+ )
+
+
+
+@inlineCallbacks
+def restoreFromTrash(store, directory, root, principals):
+
+ for principalUID in principals:
+ txn = store.newTransaction(label="Restore trashed events")
+ home = yield txn.calendarHomeWithUID(principalUID)
+ if home is None:
+ continue
+ trash = yield home.childWithName("trash")
+ names = yield trash.listObjectResources()
+ for name in names:
+ cobj = yield trash.calendarObjectWithName(name)
+ print(name, cobj)
+
+ if cobj is not None:
+ # If it's still in the trash, restore it from trash
+ if (yield cobj.isTrash()):
+ print("Restoring:", name)
+ yield cobj.fromTrash()
+
+ yield txn.commit()
+
+
+if __name__ == "__main__":
+ main()
</ins><span class="cx">Property changes on: CalendarServer/branches/users/sagen/trashcan-5/calendarserver/tools/trash.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py (14483 => 14484)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-02-27 20:14:58 UTC (rev 14483)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-02-27 20:43:08 UTC (rev 14484)
</span><span class="lines">@@ -7533,23 +7533,21 @@
</span><span class="cx"> # The parent is indeed the trash collection
</span><span class="cx"> trash = self._parentCollection
</span><span class="cx"> self._parentCollection = yield trash.originalParentForResource(self)
</span><ins>+ trashedName = self._name # for deleting trash revision below
</ins><span class="cx"> _ignore, newName = trash.parseName(self._name)
</span><span class="cx"> else:
</span><span class="cx"> # The parent is the original collection because it was retrieved
</span><span class="cx"> # via that parent, not the trash collection
</span><span class="cx"> home = self._parentCollection.viewerHome()
</span><span class="cx"> trash = yield home.childWithName("trash")
</span><ins>+ trashedName = trash.nameForResource(self._parentCollection, self)
</ins><span class="cx"> newName = self._name
</span><span class="cx">
</span><span class="cx"> yield self._updateIsTrashQuery.on(
</span><span class="cx"> self._txn, isTrash=False, trashed=None, resourceID=self._resourceID
</span><span class="cx"> )
</span><del>- yield trash._deleteRevision(
- trash.nameForResource(
- self._parentCollection,
- self
- )
- )
</del><ins>+ yield trash._deleteRevision(trashedName)
+
</ins><span class="cx"> self._name = newName
</span><span class="cx">
</span><span class="cx"> yield self._parentCollection.addedObjectResource(self)
</span></span></pre>
</div>
</div>
</body>
</html>