<!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>[15000] PyCalendar/trunk/src/pycalendar/icalendar</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/15000">15000</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 08:12:16 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow optional limit on recurrence expansion size.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyCalendartrunksrcpycalendaricalendarrecurrencepy">PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendaricalendarrecurrencesetpy">PyCalendar/trunk/src/pycalendar/icalendar/recurrenceset.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#PyCalendartrunksrcpycalendaricalendarexceptionspy">PyCalendar/trunk/src/pycalendar/icalendar/exceptions.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyCalendartrunksrcpycalendaricalendarexceptionspy"></a>
<div class="addfile"><h4>Added: PyCalendar/trunk/src/pycalendar/icalendar/exceptions.py (0 => 15000)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/icalendar/exceptions.py (rev 0)
+++ PyCalendar/trunk/src/pycalendar/icalendar/exceptions.py 2015-07-27 15:12:16 UTC (rev 15000)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+##
+# Copyright (c) 2015 Cyrus Daboo. 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 pycalendar.exceptions import ErrorBase
+
+class TooManyInstancesError(ErrorBase):
+ pass
</ins></span></pre></div>
<a id="PyCalendartrunksrcpycalendaricalendarrecurrencepy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py (14999 => 15000)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py 2015-07-26 15:18:57 UTC (rev 14999)
+++ PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py 2015-07-27 15:12:16 UTC (rev 15000)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> from pycalendar import xmlutils
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx"> from pycalendar.icalendar import definitions, xmldefinitions
</span><ins>+from pycalendar.icalendar.exceptions import TooManyInstancesError
</ins><span class="cx"> from pycalendar.period import Period
</span><span class="cx"> from pycalendar.valueutils import ValueMixin
</span><span class="cx"> import cStringIO as StringIO
</span><span class="lines">@@ -880,7 +881,7 @@
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="cx">
</span><del>- def expand(self, start, range, items, float_offset=0):
</del><ins>+ def expand(self, start, range, items, float_offset=0, maxInstances=None):
</ins><span class="cx">
</span><span class="cx"> # Have to normalize this to be very sure we are starting with a valid date, as otherwise
</span><span class="cx"> # we could end up looping forever when doing recurrence.
</span><span class="lines">@@ -906,9 +907,9 @@
</span><span class="cx">
</span><span class="cx"> # Simple expansion is one where there is no BYXXX rule part
</span><span class="cx"> if not self.hasBy():
</span><del>- self.mFullyCached = self.simpleExpand(start, range, self.mRecurrences, float_offset)
</del><ins>+ self.mFullyCached = self.simpleExpand(start, range, self.mRecurrences, float_offset, maxInstances=maxInstances)
</ins><span class="cx"> else:
</span><del>- self.mFullyCached = self.complexExpand(start, range, self.mRecurrences, float_offset)
</del><ins>+ self.mFullyCached = self.complexExpand(start, range, self.mRecurrences, float_offset, maxInstances=maxInstances)
</ins><span class="cx">
</span><span class="cx"> # Set cache values
</span><span class="cx"> self.mCached = True
</span><span class="lines">@@ -925,7 +926,7 @@
</span><span class="cx"> return limited
</span><span class="cx">
</span><span class="cx">
</span><del>- def simpleExpand(self, start, range, items, float_offset):
</del><ins>+ def simpleExpand(self, start, range, items, float_offset, maxInstances=None):
</ins><span class="cx"> start_iter = start.duplicate()
</span><span class="cx"> ctr = 0
</span><span class="cx">
</span><span class="lines">@@ -942,6 +943,8 @@
</span><span class="cx">
</span><span class="cx"> # Add current one to list
</span><span class="cx"> items.append(start_iter.duplicate())
</span><ins>+ if maxInstances and len(items) > maxInstances:
+ raise TooManyInstancesError("Too many instances")
</ins><span class="cx">
</span><span class="cx"> # Get next item
</span><span class="cx"> start_iter.recur(self.mFreq, self.mInterval, allow_invalid=True)
</span><span class="lines">@@ -961,7 +964,7 @@
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="cx">
</span><del>- def complexExpand(self, start, range, items, float_offset):
</del><ins>+ def complexExpand(self, start, range, items, float_offset, maxInstances=None):
</ins><span class="cx"> start_iter = start.duplicate()
</span><span class="cx"> ctr = 0
</span><span class="cx">
</span><span class="lines">@@ -1039,6 +1042,8 @@
</span><span class="cx">
</span><span class="cx"> # Add current one to list
</span><span class="cx"> items.append(iter)
</span><ins>+ if maxInstances and len(items) > maxInstances:
+ raise TooManyInstancesError("Too many instances")
</ins><span class="cx">
</span><span class="cx"> # Check limits
</span><span class="cx"> if self.mUseCount:
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendaricalendarrecurrencesetpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/icalendar/recurrenceset.py (14999 => 15000)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/icalendar/recurrenceset.py 2015-07-26 15:18:57 UTC (rev 14999)
+++ PyCalendar/trunk/src/pycalendar/icalendar/recurrenceset.py 2015-07-27 15:12:16 UTC (rev 15000)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+from pycalendar.icalendar.exceptions import TooManyInstancesError
</ins><span class="cx"> from pycalendar.utils import set_difference
</span><span class="cx">
</span><span class="cx"> class RecurrenceSet(object):
</span><span class="lines">@@ -182,7 +183,7 @@
</span><span class="cx"> return self.mExperiods
</span><span class="cx">
</span><span class="cx">
</span><del>- def expand(self, start, range, items, float_offset=0):
</del><ins>+ def expand(self, start, range, items, float_offset=0, maxInstances=None):
</ins><span class="cx"> # Need to return whether the limit was applied or not
</span><span class="cx"> limited = False
</span><span class="cx">
</span><span class="lines">@@ -197,18 +198,22 @@
</span><span class="cx">
</span><span class="cx"> # RRULES
</span><span class="cx"> for iter in self.mRrules:
</span><del>- if iter.expand(start, range, include, float_offset=float_offset):
</del><ins>+ if iter.expand(start, range, include, float_offset=float_offset, maxInstances=maxInstances):
</ins><span class="cx"> limited = True
</span><span class="cx">
</span><span class="cx"> # RDATES
</span><span class="cx"> for iter in self.mRdates:
</span><span class="cx"> if range.isDateWithinPeriod(iter):
</span><span class="cx"> include.append(iter)
</span><ins>+ if maxInstances and len(include) > maxInstances:
+ raise TooManyInstancesError("Too many instances")
</ins><span class="cx"> else:
</span><span class="cx"> limited = True
</span><span class="cx"> for iter in self.mRperiods:
</span><span class="cx"> if range.isPeriodOverlap(iter):
</span><span class="cx"> include.append(iter.getStart())
</span><ins>+ if maxInstances and len(include) > maxInstances:
+ raise TooManyInstancesError("Too many instances")
</ins><span class="cx"> else:
</span><span class="cx"> limited = True
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>