<!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>[12675] CalDAVTester/trunk/src/serverinfo.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/12675">12675</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 10:39:41 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speed up (a lot) the loading phase.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunksrcserverinfopy">CalDAVTester/trunk/src/serverinfo.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunksrcserverinfopy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/serverinfo.py (12674 => 12675)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/serverinfo.py 2014-02-12 15:30:33 UTC (rev 12674)
+++ CalDAVTester/trunk/src/serverinfo.py 2014-02-12 18:39:41 UTC (rev 12675)
</span><span class="lines">@@ -19,13 +19,18 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> import datetime
</span><ins>+import re
</ins><span class="cx"> import src.xmlDefs
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class serverinfo(object):
</span><span class="cx"> """
</span><span class="cx"> Maintains information about the server being targeted.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ # RegEx pattern to match substitution variables
+ subspattern = re.compile("(?P<name>\\$[_a-zA-Z][_a-zA-Z0-9\\-]*\\:)")
+
</ins><span class="cx"> def __init__(self):
</span><span class="cx"> self.host = ""
</span><span class="cx"> self.nonsslport = 80
</span><span class="lines">@@ -48,6 +53,25 @@
</span><span class="cx"> self.dtnow = datetime.date.today()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _re_subs(self, sub, mapping):
+ """
+ Do a regex substitution via the supplied mapping, only if the mapping exists.
+
+ @param sub: string to do substitution in
+ @type sub: L{str}
+ @param mapping: mapping of substitution name to value
+ @type mapping: L{dict}
+ """
+ # Helper function for .sub()
+ def convert(mo):
+ named = mo.group('name')
+ if named is not None and named in mapping:
+ return mapping[named]
+ else:
+ return named
+ return self.subspattern.sub(convert, sub)
+
+
</ins><span class="cx"> def subs(self, sub, db=None):
</span><span class="cx">
</span><span class="cx"> # Special handling for relative date-times
</span><span class="lines">@@ -76,16 +100,11 @@
</span><span class="cx">
</span><span class="cx"> if db is None:
</span><span class="cx"> db = self.subsdict
</span><del>- count = 0
- while count < 10:
- do_again = False
- for key, value in db.iteritems():
- newstr = sub.replace(key, value)
- do_again = do_again or (newstr != sub)
- sub = newstr
- if not do_again:
</del><ins>+ while '$' in sub:
+ newstr = self._re_subs(sub, db)
+ if newstr == sub:
</ins><span class="cx"> break
</span><del>- count += 1
</del><ins>+ sub = newstr
</ins><span class="cx"> return sub
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -168,6 +187,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def updateParams(self):
</span><ins>+
+ # Expand substitutions fully at this point
+ for k, v in self.subsdict.items():
+ while '$' in v:
+ v = self._re_subs(v, self.subsdict)
+ self.subsdict[k] = v
+
</ins><span class="cx"> # Now cache some useful substitutions
</span><span class="cx"> if "$userid1:" not in self.subsdict:
</span><span class="cx"> raise ValueError("Must have $userid1: substitution")
</span></span></pre>
</div>
</div>
</body>
</html>