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

List:       calendarserver-changes
Subject:    [CalendarServer-changes] [2331]
From:       source_changes () macosforge ! org
Date:       2008-04-21 19:39:18
Message-ID: 20080421193918.E9DF615C4ADE () beta ! macosforge ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 2331
          http://trac.macosforge.org/projects/calendarserver/changeset/2331
Author:   cdaboo@apple.com
Date:     2008-04-21 12:39:18 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
Update caladmin for __uids__ use with /calendars/, and for pickled xattrs.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/admin/principals.py
    CalendarServer/trunk/twistedcaldav/admin/util.py

Modified: CalendarServer/trunk/twistedcaldav/admin/principals.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/principals.py	2008-04-21 17:49:43 UTC (rev 2330)
+++ CalendarServer/trunk/twistedcaldav/admin/principals.py	2008-04-21 19:39:18 UTC (rev 2331)
@@ -61,7 +61,7 @@
                 precord = {}
                 
                 pcal = self.calendarCollection.child(
-                    self.type
+                    "__uids__"
                     ).child(util.getPrincipalName(p))
             
                 precord['principalName'] = util.getPrincipalName(p)

Modified: CalendarServer/trunk/twistedcaldav/admin/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/util.py	2008-04-21 17:49:43 UTC (rev 2330)
+++ CalendarServer/trunk/twistedcaldav/admin/util.py	2008-04-21 19:39:18 UTC (rev 2331)
@@ -17,6 +17,8 @@
 import xattr
 import zlib
 from zlib import decompress
+from cPickle import loads as unpickle, UnpicklingError
+import os
 
 import commands
 
@@ -66,7 +68,9 @@
 
     if typeRoot.exists():
         for child in typeRoot.listdir():
-            if not child.startswith(db_prefix):
+            if (not child.startswith(db_prefix) and
+                not child.endswith("#calendar-proxy-write") and
+                not child.endswith("#calendar-proxy-read")):
                 p = typeRoot.child(child)
                 ptype = getPrincipalType(p)
                 if ptype == type:
@@ -101,16 +105,8 @@
     return rtp[0].firstChild().value
     
 def getPrincipalName(fp):
-    rtp = "WebDAV:" + RecordNameProperty.sname().replace("/", "%2F")
-    x = xattr.xattr(fp.path)
-    if not x.has_key(rtp):
-        return None
+    return os.path.basename(fp.path)
 
-    dom = microdom.parseString(_getxattr_value(x, rtp))
-    rtp = microdom.getElementsByTagName(dom, 'record-name')
-
-    return rtp[0].firstChild().value
-    
 def getResourceType(fp):
     rt = 'WebDAV:{DAV:}resourcetype'
     x = xattr.xattr(fp.path)
@@ -237,10 +233,14 @@
 def _getxattr_value(x, k):
     data = x[k]
     try:
-        value = decompress(data)
+        try:
+            return unpickle(decompress(data)).toxml()
+        except UnpicklingError:
+            pass
+        return decompress(data)
     except zlib.error:
         # Value is not compressed; data was stored by old
         # code.  This is easy to handle, so let's keep
         # compatibility here.
-        value = data
-    return value
+        pass
+    return data


[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" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { overflow: auto; }
#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>
<title>[2331] CalendarServer/trunk/twistedcaldav/admin</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/calendarserver/changeset/2331">2331</a></dd>
 <dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2008-04-21 12:39:18 -0700 (Mon, 21 Apr 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>Update caladmin for __uids__ use with /calendars/, and for pickled xattrs.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavadminprincipalspy">CalendarServer/trunk/twistedcaldav/admin/principals.py</a></li>
 <li><a href="#CalendarServertrunktwistedcaldavadminutilpy">CalendarServer/trunk/twistedcaldav/admin/util.py</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavadminprincipalspy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/trunk/twistedcaldav/admin/principals.py (2330 => 2331)</h4> <pre \
class="diff"><span> <span class="info">--- \
CalendarServer/trunk/twistedcaldav/admin/principals.py	2008-04-21 17:49:43 UTC (rev \
                2330)
+++ CalendarServer/trunk/twistedcaldav/admin/principals.py	2008-04-21 19:39:18 UTC \
(rev 2331) </span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">                 precord = {}
</span><span class="cx">                 
</span><span class="cx">                 pcal = self.calendarCollection.child(
</span><del>-                    self.type
</del><ins>+                    &quot;__uids__&quot;
</ins><span class="cx">                     ).child(util.getPrincipalName(p))
</span><span class="cx">             
</span><span class="cx">                 precord['principalName'] = \
util.getPrincipalName(p) </span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavadminutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/admin/util.py \
(2330 => 2331)</h4> <pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/admin/util.py	2008-04-21 \
                17:49:43 UTC (rev 2330)
+++ CalendarServer/trunk/twistedcaldav/admin/util.py	2008-04-21 19:39:18 UTC (rev \
2331) </span><span class="lines">@@ -17,6 +17,8 @@
</span><span class="cx"> import xattr
</span><span class="cx"> import zlib
</span><span class="cx"> from zlib import decompress
</span><ins>+from cPickle import loads as unpickle, UnpicklingError
+import os
</ins><span class="cx"> 
</span><span class="cx"> import commands
</span><span class="cx"> 
</span><span class="lines">@@ -66,7 +68,9 @@
</span><span class="cx"> 
</span><span class="cx">     if typeRoot.exists():
</span><span class="cx">         for child in typeRoot.listdir():
</span><del>-            if not child.startswith(db_prefix):
</del><ins>+            if (not child.startswith(db_prefix) and
+                not child.endswith(&quot;#calendar-proxy-write&quot;) and
+                not child.endswith(&quot;#calendar-proxy-read&quot;)):
</ins><span class="cx">                 p = typeRoot.child(child)
</span><span class="cx">                 ptype = getPrincipalType(p)
</span><span class="cx">                 if ptype == type:
</span><span class="lines">@@ -101,16 +105,8 @@
</span><span class="cx">     return rtp[0].firstChild().value
</span><span class="cx">     
</span><span class="cx"> def getPrincipalName(fp):
</span><del>-    rtp = &quot;WebDAV:&quot; + \
                RecordNameProperty.sname().replace(&quot;/&quot;, &quot;%2F&quot;)
-    x = xattr.xattr(fp.path)
-    if not x.has_key(rtp):
-        return None
</del><ins>+    return os.path.basename(fp.path)
</ins><span class="cx"> 
</span><del>-    dom = microdom.parseString(_getxattr_value(x, rtp))
-    rtp = microdom.getElementsByTagName(dom, 'record-name')
-
-    return rtp[0].firstChild().value
-    
</del><span class="cx"> def getResourceType(fp):
</span><span class="cx">     rt = 'WebDAV:{DAV:}resourcetype'
</span><span class="cx">     x = xattr.xattr(fp.path)
</span><span class="lines">@@ -237,10 +233,14 @@
</span><span class="cx"> def _getxattr_value(x, k):
</span><span class="cx">     data = x[k]
</span><span class="cx">     try:
</span><del>-        value = decompress(data)
</del><ins>+        try:
+            return unpickle(decompress(data)).toxml()
+        except UnpicklingError:
+            pass
+        return decompress(data)
</ins><span class="cx">     except zlib.error:
</span><span class="cx">         # Value is not compressed; data was stored by old
</span><span class="cx">         # code.  This is easy to handle, so let's keep
</span><span class="cx">         # compatibility here.
</span><del>-        value = data
-    return value
</del><ins>+        pass
+    return data
</ins></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://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