<!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>[14580] CalendarServer/trunk</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/14580">14580</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-12 12:50:10 -0700 (Thu, 12 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>When listing trashed events, results are sorted by most-recently-trashed-first, and for repeating events, the upcoming three instances are displayed. Locations are now included, as well as displaying the start time for each event in the TZ of the event itself.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolstrashpy">CalendarServer/trunk/calendarserver/tools/trash.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.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 (14579 => 14580)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/trash.py 2015-03-12 19:48:52 UTC (rev 14579)
+++ CalendarServer/trunk/calendarserver/tools/trash.py 2015-03-12 19:50:10 UTC (rev 14580)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> from calendarserver.tools.cmdline import utilityMain, WorkerService
</span><span class="cx"> from calendarserver.tools.util import prettyRecord
</span><ins>+from pycalendar.datetime import DateTime, Timezone
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from txdav.base.propertystore.base import PropertyName
</span><span class="lines">@@ -141,7 +142,38 @@
</span><span class="cx"> yield store.inTransaction(label="List trashed collections", operation=doIt)
</span><span class="cx">
</span><span class="cx">
</span><ins>+def agoString(delta):
+ if delta.days:
+ agoString = "{} days ago".format(delta.days)
+ elif delta.seconds:
+ if delta.seconds < 60:
+ agoString = "{} second{} ago".format(delta.seconds, "s" if delta.seconds > 1 else "")
+ else:
+ minutesAgo = delta.seconds / 60
+ if minutesAgo < 60:
+ agoString = "{} minute{} ago".format(minutesAgo, "s" if minutesAgo > 1 else "")
+ else:
+ hoursAgo = minutesAgo / 60
+ agoString = "{} hour{} ago".format(hoursAgo, "s" if hoursAgo > 1 else "")
+ return agoString
</ins><span class="cx">
</span><ins>+
+def startString(pydt):
+ return pydt.getLocaleDateTime(DateTime.FULLDATE, False, True, pydt.getTimezoneID())
+
+
+def locationString(component):
+ locationProps = component.properties("LOCATION")
+ if locationProps is not None:
+ locations = []
+ for locationProp in locationProps:
+ locations.append(locationProp.value())
+ locationString = ", ".join(locations)
+ else:
+ locationString = ""
+ return locationString
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def listTrashedEventsForPrincipal(service, store, principalUID):
</span><span class="cx"> directory = store.directoryService()
</span><span class="lines">@@ -168,23 +200,68 @@
</span><span class="cx"> print("No untrashed collections for:", prettyRecord(record))
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><ins>+ oneYearInFuture = DateTime.getNowUTC()
+ oneYearInFuture.offsetDay(365)
+
+ nowPyDT = DateTime.getNowUTC()
+
+ nowDT = datetime.datetime.utcnow()
+
</ins><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="cx"> if len(children) == 0:
</span><span class="cx"> continue
</span><span class="cx">
</span><del>- print("Collection = \"{}\"".format(displayName.encode("utf-8")))
</del><ins>+ print("Trashed events in calendar \"{}\":".format(displayName.encode("utf-8")))
</ins><span class="cx"> for child in children:
</span><ins>+ print()
</ins><span class="cx"> component = yield child.component()
</span><del>- summary = component.mainComponent().propertyValue("SUMMARY", "<no title>")
</del><ins>+
+ mainSummary = component.mainComponent().propertyValue("SUMMARY", u"<no title>")
</ins><span class="cx"> whenTrashed = yield child.whenTrashed()
</span><del>- print(
- " \"{}\", trashed = {}, id = {}".format(
- summary.encode("utf-8"), whenTrashed, child._resourceID
</del><ins>+ ago = nowDT - whenTrashed
+ print(" Trashed {}:".format(agoString(ago)))
+
+ if component.isRecurring():
+ print(
+ " \"{}\" (repeating) Recovery ID = {}".format(
+ mainSummary, child._resourceID
+ )
</ins><span class="cx"> )
</span><del>- )
</del><ins>+ 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)")
</ins><span class="cx">
</span><ins>+ else:
+ print(
+ " \"{}\" (non-repeating) Recovery ID = {}".format(
+ mainSummary, child._resourceID
+ )
+ )
+ dtstart = component.mainComponent().propertyValue("DTSTART")
+ location = locationString(component.mainComponent())
+ print(" {} {}".format(startString(dtstart), location))
+
+
</ins><span class="cx"> yield store.inTransaction(label="List trashed events", operation=doIt)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14579 => 14580)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-03-12 19:48:52 UTC (rev 14579)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-03-12 19:50:10 UTC (rev 14580)
</span><span class="lines">@@ -5159,6 +5159,8 @@
</span><span class="cx"> obj.ORIGINAL_COLLECTION == Parameter("resourceID")).And(
</span><span class="cx"> obj.TRASHED >= Parameter("start")).And(
</span><span class="cx"> obj.TRASHED <= Parameter("end")),
</span><ins>+ OrderBy=obj.TRASHED,
+ Ascending=False
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>