<!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>[14790] CalDAVClientLibrary/trunk/caldavclientlibrary</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/14790">14790</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-17 23:27:37 -0700 (Sun, 17 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for OPTIONS request.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommands__init__py">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/__init__.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryclientclientsessionpy">CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsoptionspy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/options.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommands__init__py"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/__init__.py (14789 => 14790)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/__init__.py        2015-05-15 00:42:06 UTC (rev 14789)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/__init__.py        2015-05-18 06:27:37 UTC (rev 14790)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> "mkdir",
</span><span class="cx"> "mv",
</span><span class="cx"> "notifications",
</span><ins>+ "options",
</ins><span class="cx"> "post",
</span><span class="cx"> "principal",
</span><span class="cx"> "props",
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsoptionspy"></a>
<div class="addfile"><h4>Added: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/options.py (0 => 14790)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/options.py         (rev 0)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/options.py        2015-05-18 06:27:37 UTC (rev 14790)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+##
+# Copyright (c) 2015 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 caldavclientlibrary.browser.command import Command
+from caldavclientlibrary.browser.command import WrongOptions
+from caldavclientlibrary.protocol.url import URL
+import os
+import getopt
+import shlex
+
+class Cmd(Command):
+
+ def __init__(self):
+ super(Command, self).__init__()
+ self.cmds = ("options",)
+ self.do_wd_complete = True
+
+
+ def execute(self, cmdname, options):
+
+ opts, args = getopt.getopt(shlex.split(options), '')
+
+ data = None
+ content_type = None
+ path = None
+
+ for name, _ignore_value in opts:
+
+ print "Unknown option: %s" % (name,)
+ print self.usage(cmdname)
+ raise WrongOptions
+
+ if len(args) > 1:
+ print "Wrong number of arguments: %d" % (len(args),)
+ print self.usage(cmdname)
+ raise WrongOptions
+ elif args:
+ path = args[0]
+ if not path.startswith("/"):
+ path = os.path.join(self.shell.wd, path)
+ else:
+ path = self.shell.wd
+
+ resource = URL(url=path)
+ self.shell.account.session.writeData(resource, data, content_type, method="OPTIONS")
+
+ return True
+
+
+ def usage(self, name):
+ return """Usage: %s OPTIONS PATH
+PATH is a relative or absolute path.
+
+Options: None
+""" % (name,)
+
+
+ def helpDescription(self):
+ return "Execute an OPTIONS request on the server."
</ins></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryclientclientsessionpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py (14789 => 14790)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py        2015-05-15 00:42:06 UTC (rev 14789)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/clientsession.py        2015-05-18 06:27:37 UTC (rev 14790)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.get import Get
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.makecollection import MakeCollection
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.move import Move
</span><ins>+from caldavclientlibrary.protocol.webdav.options import Options
</ins><span class="cx"> from caldavclientlibrary.protocol.webdav.post import Post
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.principalmatch import PrincipalMatch
</span><span class="cx"> from caldavclientlibrary.protocol.webdav.propall import PropAll
</span><span class="lines">@@ -727,6 +728,8 @@
</span><span class="cx"> request = Put(self, rurl.relativeURL())
</span><span class="cx"> elif method == "POST":
</span><span class="cx"> request = Post(self, rurl.relativeURL())
</span><ins>+ elif method == "OPTIONS":
+ request = Options(self, rurl.relativeURL())
</ins><span class="cx">
</span><span class="cx"> dout = ResponseDataString()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>