<!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>[14585] CalendarServer/trunk/calendarserver/tools/trash.py</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/14585">14585</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-12 19:18:06 -0700 (Thu, 12 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweaks to trash tool output</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolstrashpy">CalendarServer/trunk/calendarserver/tools/trash.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolstrashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/trash.py (14584 => 14585)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/trash.py 2015-03-12 23:27:10 UTC (rev 14584)
+++ CalendarServer/trunk/calendarserver/tools/trash.py 2015-03-13 02:18:06 UTC (rev 14585)
</span><span class="lines">@@ -119,25 +119,30 @@
</span><span class="cx"> print("No trashed collections for:", prettyRecord(record))
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><del>- print("Listing trashed collections for:", prettyRecord(record))
</del><ins>+ print("Trashed collections for:", prettyRecord(record))
+
+ nowDT = datetime.datetime.utcnow()
+
</ins><span class="cx"> for collection in trashedCollections:
</span><span class="cx"> displayName = displayNameForCollection(collection)
</span><ins>+ whenTrashed = collection.whenTrashed()
+ ago = nowDT - whenTrashed
+ print()
+ print(" Trashed {}:".format(agoString(ago)))
</ins><span class="cx"> print(
</span><del>- "Collection = \"{}\", trashed = {}, id = {}".format(
- displayName.encode("utf-8"), collection.whenTrashed(),
- collection._resourceID
</del><ins>+ " \"{}\" (collection) Recovery ID = {}".format(
+ displayName.encode("utf-8"), collection._resourceID
</ins><span class="cx"> )
</span><span class="cx"> )
</span><del>- startTime = collection.whenTrashed() - datetime.timedelta(minutes=5)
</del><ins>+ startTime = whenTrashed - datetime.timedelta(minutes=5)
</ins><span class="cx"> children = yield trash.trashForCollection(
</span><span class="cx"> collection._resourceID, start=startTime
</span><span class="cx"> )
</span><del>- print(" ...containing events:")
</del><ins>+ print(" ...containing events:")
</ins><span class="cx"> for child in children:
</span><span class="cx"> component = yield child.component()
</span><span class="cx"> summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
</span><del>- whenTrashed = yield child.whenTrashed()
- print(" \"{}\", trashed = {}".format(summary.encode("utf-8"), whenTrashed))
</del><ins>+ print(" \"{}\"".format(summary.encode("utf-8")))
</ins><span class="cx">
</span><span class="cx"> yield store.inTransaction(label="List trashed collections", operation=doIt)
</span><span class="cx">
</span><span class="lines">@@ -175,6 +180,58 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+def printEventDetails(event):
+ nowPyDT = DateTime.getNowUTC()
+ nowDT = datetime.datetime.utcnow()
+ oneYearInFuture = DateTime.getNowUTC()
+ oneYearInFuture.offsetDay(365)
+
+ component = yield event.component()
+ mainSummary = component.mainComponent().propertyValue("SUMMARY", u"<no title>")
+ whenTrashed = yield event.whenTrashed()
+ ago = nowDT - whenTrashed
+ print(" Trashed {}:".format(agoString(ago)))
+
+ if component.isRecurring():
+ print(
+ " \"{}\" (repeating) Recovery ID = {}".format(
+ mainSummary, event._resourceID
+ )
+ )
+ print(" ...upcoming instances:")
+ instances = component.cacheExpandedTimeRanges(oneYearInFuture)
+ instances = sorted(instances.instances.values(), key=lambda x: x.start)
+ limit = 3
+ count = 0
+ for instance in instances:
+ if instance.start >= nowPyDT:
+ summary = instance.component.propertyValue("SUMMARY", u"<no title>")
+ location = locationString(instance.component)
+ tzid = instance.component.getProperty("DTSTART").parameterValue("TZID", None)
+ dtstart = instance.start
+ if tzid is not None:
+ timezone = Timezone(tzid=tzid)
+ dtstart.adjustTimezone(timezone)
+ print(" \"{}\" {} {}".format(summary, startString(dtstart), location))
+ count += 1
+ limit -= 1
+ if limit == 0:
+ break
+ if not count:
+ print(" (none)")
+
+ else:
+ print(
+ " \"{}\" (non-repeating) Recovery ID = {}".format(
+ mainSummary, event._resourceID
+ )
+ )
+ dtstart = component.mainComponent().propertyValue("DTSTART")
+ location = locationString(component.mainComponent())
+ print(" {} {}".format(startString(dtstart), location))
+
+
+@inlineCallbacks
</ins><span class="cx"> def listTrashedEventsForPrincipal(service, store, principalUID):
</span><span class="cx"> directory = store.directoryService()
</span><span class="cx"> record = yield directory.recordWithUID(principalUID)
</span><span class="lines">@@ -200,13 +257,7 @@
</span><span class="cx"> print("No untrashed collections for:", prettyRecord(record))
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><del>- oneYearInFuture = DateTime.getNowUTC()
- oneYearInFuture.offsetDay(365)
</del><span class="cx">
</span><del>- nowPyDT = DateTime.getNowUTC()
-
- nowDT = datetime.datetime.utcnow()
-
</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">@@ -216,52 +267,9 @@
</span><span class="cx"> print("Trashed events in calendar \"{}\":".format(displayName.encode("utf-8")))
</span><span class="cx"> for child in children:
</span><span class="cx"> print()
</span><del>- component = yield child.component()
</del><ins>+ yield printEventDetails(child)
+ print()
</ins><span class="cx">
</span><del>- mainSummary = component.mainComponent().propertyValue("SUMMARY", u"<no title>")
- whenTrashed = yield child.whenTrashed()
- ago = nowDT - whenTrashed
- print(" Trashed {}:".format(agoString(ago)))
-
- if component.isRecurring():
- print(
- " \"{}\" (repeating) Recovery ID = {}".format(
- mainSummary, child._resourceID
- )
- )
- print(" ...upcoming instances:")
- instances = component.cacheExpandedTimeRanges(oneYearInFuture)
- instances = sorted(instances.instances.values(), key=lambda x: x.start)
- limit = 3
- count = 0
- for instance in instances:
- if instance.start >= nowPyDT:
- summary = instance.component.propertyValue("SUMMARY", u"<no title>")
- location = locationString(instance.component)
- tzid = instance.component.getProperty("DTSTART").parameterValue("TZID", None)
- dtstart = instance.start
- if tzid is not None:
- timezone = Timezone(tzid=tzid)
- dtstart.adjustTimezone(timezone)
- print(" \"{}\" {} {}".format(summary, startString(dtstart), location))
- count += 1
- limit -= 1
- if limit == 0:
- break
- if not count:
- print(" (none)")
-
- else:
- print(
- " \"{}\" (non-repeating) Recovery ID = {}".format(
- mainSummary, child._resourceID
- )
- )
- dtstart = component.mainComponent().propertyValue("DTSTART")
- location = locationString(component.mainComponent())
- print(" {} {}".format(startString(dtstart), location))
-
-
</del><span class="cx"> yield store.inTransaction(label="List trashed events", operation=doIt)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -370,19 +378,14 @@
</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>+ print("Collection \"{}\":".format(displayName.encode("utf-8")))
</ins><span class="cx"> for child in children:
</span><span class="cx"> component = yield child.component()
</span><span class="cx"> summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
</span><del>- whenTrashed = yield child.whenTrashed()
</del><span class="cx"> if verbose:
</span><del>- print(
- " \"{}\", trashed = {}, id = {}".format(
- summary.encode("utf-8"), whenTrashed, child._resourceID
- )
- )
- print("Removing...")
</del><ins>+ print(" Removing \"{}\"...".format(summary))
</ins><span class="cx"> yield child.reallyRemove()
</span><ins>+ print()
</ins><span class="cx">
</span><span class="cx"> if txn is None:
</span><span class="cx"> yield store.inTransaction(label="Empty trash", operation=doIt)
</span></span></pre>
</div>
</div>
</body>
</html>