<!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>[12949] 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/12949">12949</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 13:20:04 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>nuke calendarserver_load_augmentdb</pre>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbincalendarserver_load_augmentdb">CalendarServer/trunk/bin/calendarserver_load_augmentdb</a></li>
<li><a href="#CalendarServertrunkbinpycalendarserver_load_augmentdb">CalendarServer/trunk/bin/py/calendarserver_load_augmentdb</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsloadaugmentdbpy">CalendarServer/trunk/calendarserver/tools/loadaugmentdb.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbincalendarserver_load_augmentdb"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/calendarserver_load_augmentdb (12948 => 12949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/calendarserver_load_augmentdb        2014-03-18 20:11:18 UTC (rev 12948)
+++ CalendarServer/trunk/bin/calendarserver_load_augmentdb        2014-03-18 20:20:04 UTC (rev 12949)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-#!/bin/sh
-# -*- sh-basic-offset: 2 -*-
-
-##
-# Copyright (c) 2014 Apple Inc. 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.
-##
-
-set -e
-set -u
-
-wd="$(cd "$(dirname "$0")/.." && pwd)";
-
-. "${wd}/bin/_build.sh";
-
-do_setup="false";
-
-develop > /dev/null;
-
-exec "${python}" "${wd}/bin/py/$(basename "$0")" "$@";
</del></span></pre></div>
<a id="CalendarServertrunkbinpycalendarserver_load_augmentdb"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/bin/py/calendarserver_load_augmentdb (12948 => 12949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/py/calendarserver_load_augmentdb        2014-03-18 20:11:18 UTC (rev 12948)
+++ CalendarServer/trunk/bin/py/calendarserver_load_augmentdb        2014-03-18 20:20:04 UTC (rev 12949)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-#!/usr/bin/env python
-##
-# Copyright (c) 2010-2014 Apple Inc. 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.
-##
-
-import sys
-
-#PYTHONPATH
-
-if __name__ == "__main__":
- try:
- sys.path.insert(0, PYTHONPATH)
- except NameError:
- sys.exc_clear()
-
- from calendarserver.tools.loadaugmentdb import main
- main()
</del></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsloadaugmentdbpy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/calendarserver/tools/loadaugmentdb.py (12948 => 12949)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/loadaugmentdb.py        2014-03-18 20:11:18 UTC (rev 12948)
+++ CalendarServer/trunk/calendarserver/tools/loadaugmentdb.py        2014-03-18 20:20:04 UTC (rev 12949)
</span><span class="lines">@@ -1,175 +0,0 @@
</span><del>-#!/usr/bin/env python
-##
-# Copyright (c) 2009-2014 Apple Inc. 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 __future__ import print_function
-
-import os
-import sys
-from grp import getgrnam
-from pwd import getpwnam
-from getopt import getopt, GetoptError
-
-from twext.python.log import LogLevel, Logger
-
-from twisted.internet import reactor
-from twisted.internet.defer import inlineCallbacks
-from twisted.python.util import switchUID
-
-from twistedcaldav.config import config, ConfigurationError
-from twistedcaldav.directory import augment
-from twistedcaldav.directory.augment import AugmentXMLDB
-
-from calendarserver.tools.managetimezones import StandardIOObserver
-from calendarserver.tools.util import loadConfig, getDirectory, \
- autoDisableMemcached
-
-log = Logger()
-
-
-
-class UsageError (StandardError):
- pass
-
-
-
-def usage(e=None):
- if e:
- print(e)
- print("")
-
- name = os.path.basename(sys.argv[0])
- print("usage: %s [options]" % (name,))
- print("")
- print("Populate an sqlite or PostgreSQL augments database with values")
- print("from an XML augments file.")
- print("")
- print("options:")
- print(" -h --help: print this help and exit")
- print(" -f --config: Specify caldavd.plist configuration path")
- print(" -x --xmlfile: Specify xml augments file path")
- print(" -r --remove: Remove all entries from the database")
-
- if e:
- sys.exit(64)
- else:
- sys.exit(0)
-
-
-
-def main():
- try:
- (optargs, args) = getopt(
- sys.argv[1:], "hf:rx:", [
- "config=",
- "remove",
- "xmlfile=",
- "help",
- ],
- )
- except GetoptError, e:
- usage(e)
-
- configFileName = None
- xmlFileName = None
- remove = False
-
- for opt, arg in optargs:
- if opt in ("-h", "--help"):
- usage()
-
- elif opt in ("-f", "--config"):
- configFileName = arg
-
- elif opt in ("-r", "--remove"):
- remove = True
- if raw_input("Do you really want to remove all records from the database? [y/n] ") != "y":
- sys.exit(0)
-
- elif opt in ("-x", "--xmlfile"):
- xmlFileName = arg
-
- if args:
- usage("Too many arguments: %s" % (" ".join(args),))
-
- observer = StandardIOObserver()
- observer.start()
-
- #
- # Get configuration
- #
- try:
- loadConfig(configFileName)
- log.publisher.levels.setLogLevelForNamespace(None, LogLevel.warn)
-
- # Shed privileges
- if config.UserName and config.GroupName and os.getuid() == 0:
- uid = getpwnam(config.UserName).pw_uid
- gid = getgrnam(config.GroupName).gr_gid
- switchUID(uid, uid, gid)
-
- os.umask(config.umask)
-
- config.directory = getDirectory()
- autoDisableMemcached(config)
- except ConfigurationError, e:
- usage("Unable to start: %s" % (e,))
-
- try:
- dbxml = AugmentXMLDB((xmlFileName,)) if not remove else None
- except IOError, e:
- usage("Could not read XML augment file: %s" % (e,))
-
- #
- # Start the reactor
- #
- reactor.callLater(0, run, dbxml)
- reactor.run()
-
-
-
-@inlineCallbacks
-def run(dbxml):
-
- try:
- uids = set((yield augment.AugmentService.getAllUIDs()))
- added = 0
- updated = 0
- removed = 0
- if dbxml:
- yield augment.AugmentService.addAugmentRecords(dbxml.db.values(),)
- add_records = list()
- modify_records = list()
- for record in dbxml.db.values():
- if record.uid in uids:
- modify_records.append(record)
- else:
- add_records.append(record)
- added = len(add_records)
- updated = len(modify_records)
-
- remove_uids = uids.difference(dbxml.db.keys())
- yield augment.AugmentService.removeAugmentRecords(remove_uids)
- removed = len(remove_uids)
-
- print("Changes:")
- print(" Added: %d" % (added,))
- print(" Changed: %d" % (updated,))
- print(" Removed: %d" % (removed,))
- finally:
- #
- # Stop the reactor
- #
- reactor.stop()
</del></span></pre>
</div>
</div>
</body>
</html>