<!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>[14470] CalendarServer/branches/users/sagen/trashcan-4</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/14470">14470</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-02-24 08:43:24 -0800 (Tue, 24 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan4calendarservertoolscmdlinepy">CalendarServer/branches/users/sagen/trashcan-4/calendarserver/tools/cmdline.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan4twistedcaldavstdconfigpy">CalendarServer/branches/users/sagen/trashcan-4/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan4txdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan4calendarservertoolscmdlinepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/calendarserver/tools/cmdline.py (14469 => 14470)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/calendarserver/tools/cmdline.py 2015-02-24 01:10:35 UTC (rev 14469)
+++ CalendarServer/branches/users/sagen/trashcan-4/calendarserver/tools/cmdline.py 2015-02-24 16:43:24 UTC (rev 14470)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> from twistedcaldav.config import ConfigurationError
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twisted.application.service import Service
</span><ins>+from twisted.python.logfile import LogFile
+from twisted.python.log import FileLogObserver
</ins><span class="cx">
</span><span class="cx"> import sys
</span><span class="cx"> from calendarserver.tap.util import getRootResource
</span><span class="lines">@@ -94,6 +96,15 @@
</span><span class="cx"> if patchConfig is not None:
</span><span class="cx"> patchConfig(config)
</span><span class="cx">
</span><ins>+ utilityLogFile = LogFile.fromFullPath(
+ config.UtilityLogFile,
+ rotateLength=config.ErrorLogRotateMB * 1024 * 1024,
+ maxRotatedFiles=config.ErrorLogMaxRotatedFiles
+ )
+ utilityLogObserver = FileLogObserver(utilityLogFile)
+ utilityLogObserver.start()
+
+
</ins><span class="cx"> checkDirectories(config)
</span><span class="cx">
</span><span class="cx"> config.ProcessType = "Utility"
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan4twistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/twistedcaldav/stdconfig.py (14469 => 14470)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/twistedcaldav/stdconfig.py 2015-02-24 01:10:35 UTC (rev 14469)
+++ CalendarServer/branches/users/sagen/trashcan-4/twistedcaldav/stdconfig.py 2015-02-24 16:43:24 UTC (rev 14470)
</span><span class="lines">@@ -17,9 +17,11 @@
</span><span class="cx">
</span><span class="cx"> import copy
</span><span class="cx"> import os
</span><ins>+from os.path import basename
</ins><span class="cx"> from plistlib import PlistParser # @UnresolvedImport
</span><span class="cx"> import re
</span><span class="cx"> from socket import getfqdn, gethostbyname
</span><ins>+import sys
</ins><span class="cx">
</span><span class="cx"> from calendarserver.push.util import getAPNTopicFromCertificate
</span><span class="cx"> from twext.python.log import Logger, InvalidLogLevelError, LogLevel
</span><span class="lines">@@ -386,6 +388,7 @@
</span><span class="cx"> "AccessLogFile" : "access.log", # Apache-style access log
</span><span class="cx"> "ErrorLogFile" : "error.log", # Server activity log
</span><span class="cx"> "AgentLogFile" : "agent.log", # Agent activity log
</span><ins>+ "UtilityLogFile" : "{}.log".format(basename(sys.argv[0])), # Command line utility log
</ins><span class="cx"> "ErrorLogEnabled" : True, # True = use log file, False = stdout
</span><span class="cx"> "ErrorLogRotateMB" : 10, # Rotate error log after so many megabytes
</span><span class="cx"> "ErrorLogMaxRotatedFiles" : 5, # Retain this many error log files
</span><span class="lines">@@ -1190,6 +1193,7 @@
</span><span class="cx"> ("LogRoot", "AccessLogFile"),
</span><span class="cx"> ("LogRoot", "ErrorLogFile"),
</span><span class="cx"> ("LogRoot", "AgentLogFile"),
</span><ins>+ ("LogRoot", "UtilityLogFile"),
</ins><span class="cx"> ("LogRoot", ("Postgres", "LogFile",)),
</span><span class="cx"> ("LogRoot", ("LogDatabase", "StatisticsLogFile",)),
</span><span class="cx"> ("LogRoot", "AccountingLogRoot"),
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan4txdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py (14469 => 14470)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py 2015-02-24 01:10:35 UTC (rev 14469)
+++ CalendarServer/branches/users/sagen/trashcan-4/txdav/common/datastore/test/test_sql.py 2015-02-24 16:43:24 UTC (rev 14470)
</span><span class="lines">@@ -1332,3 +1332,163 @@
</span><span class="cx"> self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</span><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><ins>+
+
+ @inlineCallbacks
+ def test_trashScheduledSpanningNowAttendeeRemove(self):
+
+ from twistedcaldav.stdconfig import config
+ self.patch(config, "EnableTrashCollection", True)
+
+ # A month in the past
+ start = DateTime.getNowUTC()
+ start.setHHMMSS(0, 0, 0)
+ start.offsetMonth(-1)
+ end = DateTime.getNowUTC()
+ end.setHHMMSS(1, 0, 0)
+ end.offsetMonth(-1)
+ subs = {
+ "start": start,
+ "end": end,
+ }
+
+ data1 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+RRULE:FREQ=WEEKLY;COUNT=20
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ data2 = """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890-attendee-reply
+DTSTART;TZID=America/Los_Angeles:%(start)s
+DTEND;TZID=America/Los_Angeles:%(end)s
+DTSTAMP:20150204T192546Z
+RRULE:FREQ=WEEKLY;COUNT=20
+SUMMARY:Scheduled
+ORGANIZER;CN="User 01":mailto:user01@example.com
+ATTENDEE:mailto:user01@example.com
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:user02@example.com
+END:VEVENT
+END:VCALENDAR
+""" % subs
+
+ # user01 invites user02
+ txn = self.store.newTransaction()
+ yield self._createResource(
+ txn, "user01", "calendar", "test.ics", data1
+ )
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's copy has SCHEDULE-STATUS update
+ txn = self.store.newTransaction()
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=1.2" in data)
+
+ # user02 has an inbox item
+ resourceNames = yield self._getResourceNames(txn, "user02", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+
+ # user02 accepts
+ yield self._updateResource(txn, "user02", "calendar", "", data2)
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01 has an inbox item
+ txn = self.store.newTransaction()
+ resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
+ self.assertEqual(len(resourceNames), 1)
+
+ # user01's copy has SCHEDULE-STATUS update
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("SCHEDULE-STATUS=2.0" in data)
+ self.assertTrue("PARTSTAT=ACCEPTED" in data)
+ resource = yield self._getResource(txn, "user02", "inbox", "")
+ yield resource.remove()
+
+ yield txn.commit()
+
+ # user02 trashes event
+ txn = self.store.newTransaction()
+ resource = yield self._getResource(txn, "user02", "calendar", "")
+ yield resource.remove()
+ yield txn.commit()
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # user01's copy shows user02 declined
+ txn = self.store.newTransaction()
+ data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ self.assertTrue("PARTSTAT=DECLINED" in data)
+ yield txn.commit()
+
+ # # user02's copy is cancelled
+ # txn = self.store.newTransaction()
+ # data = yield self._getResourceData(txn, "user02", "inbox", "")
+ # self.assertTrue("METHOD:CANCEL" in data)
+ # resource = yield self._getResource(txn, "user02", "inbox", "")
+ # yield resource.remove()
+ # data = yield self._getResourceData(txn, "user02", "calendar", "")
+ # self.assertTrue("STATUS:CANCELLED" in data)
+ # resource = yield self._getResource(txn, "user02", "calendar", "")
+ # yield resource.remove()
+ # data = yield self._getResource(txn, "user02", "trash", "")
+ # self.assertEquals(data, None)
+ # yield txn.commit()
+
+ # # user01 restores event from the trash
+ # txn = self.store.newTransaction()
+ # resource = yield self._getResource(txn, "user01", "trash", "")
+ # yield resource.fromTrash()
+ # yield txn.commit()
+
+ # yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ # txn = self.store.newTransaction()
+
+ # # user01's trash should be empty
+ # resourceNames = yield self._getResourceNames(txn, "user01", "trash")
+ # self.assertEquals(len(resourceNames), 0)
+
+ # # user01 should have test.ics and a new .ics
+ # resourceNames = yield self._getResourceNames(txn, "user01", "calendar")
+ # self.assertEquals(len(resourceNames), 2)
+ # self.assertTrue("test.ics" in resourceNames)
+ # resourceNames.remove("test.ics")
+ # newName = resourceNames[0]
+
+ # # user01's test.ics -- verify it got split correctly
+ # data = yield self._getResourceData(txn, "user01", "calendar", "test.ics")
+ # self.assertTrue("COUNT=15" in data)
+
+ # # user01's new .ics -- verify it got split correctly
+ # data = yield self._getResourceData(txn, "user01", "calendar", newName)
+ # self.assertTrue("RRULE:FREQ=WEEKLY;UNTIL=" in data)
+
+ # # user02's copy should be back on their calendar, and not in trash
+
+ # resourceNames = yield self._getResourceNames(txn, "user02", "calendar")
+ # self.assertEquals(len(resourceNames), 1)
+ # resourceNames = yield self._getResourceNames(txn, "user02", "trash")
+ # self.assertEquals(len(resourceNames), 0)
+
+ # data = yield self._getResourceData(txn, "user02", "calendar", "")
+ # self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
+
+ # yield txn.commit()
</ins></span></pre>
</div>
</div>
</body>
</html>