[prev in list] [next in list] [prev in thread] [next in thread] 

List:       calendarserver-changes
Subject:    [CalendarServer-changes] [15070] CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/ que
From:       source_changes () macosforge ! org
Date:       2015-08-27 1:58:53
Message-ID: 20150827015854.57388140F0F () svn ! calendarserver ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 15070
          http://trac.calendarserver.org//changeset/15070
Author:   sagen@apple.com
Date:     2015-08-26 18:58:53 -0700 (Wed, 26 Aug 2015)
Log Message:
-----------
Adds 'query -D' which prints details about events -- so far just the SUMMARY

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py	2015-08-26 \
                18:01:05 UTC (rev 15069)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py	2015-08-27 \
01:58:53 UTC (rev 15070) @@ -23,6 +23,7 @@
 import shlex
 import time
 from caldavclientlibrary.protocol.caldav.definitions import caldavxml
+from pycalendar.icalendar.calendar import Calendar
 
 class Cmd(Command):
 
@@ -39,8 +40,9 @@
         end = None
         expand = False
         data = False
+        details = False
 
-        opts, args = getopt.getopt(shlex.split(options), 'ts:e:xd')
+        opts, args = getopt.getopt(shlex.split(options), 'ts:e:xdD')
 
         for name, value in opts:
 
@@ -54,6 +56,8 @@
                 expand = True
             elif name == "-d":
                 data = True
+            elif name == "-D":
+                details = True
             else:
                 print "Unknown option: %s" % (name,)
                 print self.usage(cmdname)
@@ -85,7 +89,20 @@
             props += (caldavxml.calendar_data,)
         results = self.shell.account.session.queryCollection(resource, timerange, \
start, end, expand, props=props)  for href in results:
-            print href
+            if details:
+                summaries = []
+                data = self.shell.account.session.readData(href)
+                try:
+                    cobject = Calendar.parseData(data[0])
+                    for comp in cobject.getComponents():
+                        for summary in [p.getValue().getValue() for p in \
comp.getProperties("SUMMARY")]: +                            if summary not in \
summaries: +                                summaries.append(summary)
+                except:
+                    summaries = ["<Could not parse>"]
+                print href, "summary: {}".format("|".join(summaries))
+            else:
+                print href
 
         return True
 
@@ -100,6 +117,7 @@
 -e        end time [DEFAULT tomorrow]
 -x        expand components
 -d        return data
+-D        print details including SUMMARY
 """ % (name,)
 
 


[Attachment #5 (text/html)]

<!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>[15070] CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.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/15070">15070</a></dd> <dt>Author</dt> \
<dd>sagen@apple.com</dd> <dt>Date</dt> <dd>2015-08-26 18:58:53 -0700 (Wed, 26 Aug \
2015)</dd> </dl>

<h3>Log Message</h3>
<pre>Adds 'query -D' which prints details about events -- so far just the \
SUMMARY</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsquerypy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsquerypy"></a>
<div class="modfile"><h4>Modified: \
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py (15069 => \
15070)</h4> <pre class="diff"><span>
<span class="info">--- \
CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py	2015-08-26 \
                18:01:05 UTC (rev 15069)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/query.py	2015-08-27 \
01:58:53 UTC (rev 15070) </span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> import shlex
</span><span class="cx"> import time
</span><span class="cx"> from caldavclientlibrary.protocol.caldav.definitions import \
caldavxml </span><ins>+from pycalendar.icalendar.calendar import Calendar
</ins><span class="cx"> 
</span><span class="cx"> class Cmd(Command):
</span><span class="cx"> 
</span><span class="lines">@@ -39,8 +40,9 @@
</span><span class="cx">         end = None
</span><span class="cx">         expand = False
</span><span class="cx">         data = False
</span><ins>+        details = False
</ins><span class="cx"> 
</span><del>-        opts, args = getopt.getopt(shlex.split(options), 'ts:e:xd')
</del><ins>+        opts, args = getopt.getopt(shlex.split(options), 'ts:e:xdD')
</ins><span class="cx"> 
</span><span class="cx">         for name, value in opts:
</span><span class="cx"> 
</span><span class="lines">@@ -54,6 +56,8 @@
</span><span class="cx">                 expand = True
</span><span class="cx">             elif name == &quot;-d&quot;:
</span><span class="cx">                 data = True
</span><ins>+            elif name == &quot;-D&quot;:
+                details = True
</ins><span class="cx">             else:
</span><span class="cx">                 print &quot;Unknown option: %s&quot; % \
(name,) </span><span class="cx">                 print self.usage(cmdname)
</span><span class="lines">@@ -85,7 +89,20 @@
</span><span class="cx">             props += (caldavxml.calendar_data,)
</span><span class="cx">         results = \
self.shell.account.session.queryCollection(resource, timerange, start, end, expand, \
props=props) </span><span class="cx">         for href in results:
</span><del>-            print href
</del><ins>+            if details:
+                summaries = []
+                data = self.shell.account.session.readData(href)
+                try:
+                    cobject = Calendar.parseData(data[0])
+                    for comp in cobject.getComponents():
+                        for summary in [p.getValue().getValue() for p in \
comp.getProperties(&quot;SUMMARY&quot;)]: +                            if summary not \
in summaries: +                                summaries.append(summary)
+                except:
+                    summaries = [&quot;&lt;Could not parse&gt;&quot;]
+                print href, &quot;summary: \
{}&quot;.format(&quot;|&quot;.join(summaries)) +            else:
+                print href
</ins><span class="cx"> 
</span><span class="cx">         return True
</span><span class="cx"> 
</span><span class="lines">@@ -100,6 +117,7 @@
</span><span class="cx"> -e        end time [DEFAULT tomorrow]
</span><span class="cx"> -x        expand components
</span><span class="cx"> -d        return data
</span><ins>+-D        print details including SUMMARY
</ins><span class="cx"> &quot;&quot;&quot; % (name,)
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic