[IMP] caldav

bzr revid: hmo@tinyerp.com-20100421133402-191nwwj3nohx6zas

2 files changed, 98 insertions, 3 deletions

diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index d8b369b5ecf..d8e654728e2 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -82,6 +82,20 @@ class openerp_dav_handler(dav_interface):
     def _get_dav_supportedlock(self, uri):
         raise DAV_NotFound
 
+    def match_prop(self, uri, match, ns, propname):        
+        if uri[-1]=='/':uri=uri[:-1]
+        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
+        if not dbname:
+            if cr: cr.close()
+            raise DAV_NotFound
+        node = self.uri2object(cr, uid, pool, uri2)        
+        if not node:
+            cr.close()
+            raise DAV_NotFound
+        res = node.match_dav_eprop(cr, match, ns, propname)        
+        cr.close()          
+        return res  
+
     def get_prop(self, uri, ns, propname):
         """ return the value of a given property
 
@@ -209,14 +223,14 @@ class openerp_dav_handler(dav_interface):
             return None
         return pool.get('document.directory').get_object(cr, uid, uri)
 
-    def get_data(self,uri):        
+    def get_data(self,uri):    
         self.parent.log_message('GET: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         try:
             if not dbname:
                 raise DAV_Error, 409
-            node = self.uri2object(cr,uid,pool, uri2)            
+            node = self.uri2object(cr,uid,pool, uri2)   
             if not node:
                 raise DAV_NotFound(uri2)
             try:
@@ -390,6 +404,7 @@ class openerp_dav_handler(dav_interface):
             node = self.uri2object(cr,uid,pool, uri2[:])
         except:
             node = False
+        node.headers = self.parent.headers
         objname = uri2[-1]
         ext = objname.find('.') >0 and objname.split('.')[1] or False
 
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 6cda2d172ef..5f88f90cf11 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -33,7 +33,10 @@ from dav_fs import openerp_dav_handler
 from tools.config import config
 from DAV.WebDAVServer import DAVRequestHandler
 from service.websrv_lib import HTTPDir,FixSendError
-
+import urlparse
+import urllib
+from string import atoi,split
+from DAV.errors import *
 
 def OpenDAVConfig(**kw):
     class OpenDAV:
@@ -81,6 +84,83 @@ class DAVHandler(FixSendError,DAVRequestHandler):
     def log_error(self, format, *args):
         netsvc.Logger().notifyChannel('xmlrpc',netsvc.LOG_WARNING,format % args)
 
+    def do_PUT(self):
+        dc=self.IFACE_CLASS        
+        uri=urlparse.urljoin(self.get_baseuri(dc), self.path)
+        uri=urllib.unquote(uri)
+        # Handle If-Match
+        if self.headers.has_key('If-Match'):
+            test = False
+            etag = None
+            
+            for match in self.headers['If-Match'].split(','):                
+                if match == '*':
+                    if dc.exists(uri):
+                        test = True
+                        break
+                else:
+                    if dc.match_prop(uri, match, "DAV:", "getetag"):
+                        test = True
+                        break
+            if not test:
+                self.send_status(412)
+                return
+
+        # Handle If-None-Match
+        if self.headers.has_key('If-None-Match'):
+            test = True
+            etag = None            
+            for match in self.headers['If-None-Match'].split(','):
+                if match == '*':
+                    if dc.exists(uri):
+                        test = False
+                        break
+                else:
+                    if dc.match_prop(uri, match, "DAV:", "getetag"):
+                        test = False
+                        break
+            if not test:
+                self.send_status(412)
+                return
+
+        # Handle expect
+        expect = self.headers.get('Expect', '')
+        if (expect.lower() == '100-continue' and
+                self.protocol_version >= 'HTTP/1.1' and
+                self.request_version >= 'HTTP/1.1'):
+            self.send_status(100)
+            self._flush()
+
+        # read the body
+        body=None
+        if self.headers.has_key("Content-Length"):
+            l=self.headers['Content-Length']
+            body=self.rfile.read(atoi(l))
+
+        # locked resources are not allowed to be overwritten
+        if self._l_isLocked(uri):
+            return self.send_body(None, '423', 'Locked', 'Locked')
+
+        ct=None
+        if self.headers.has_key("Content-Type"):
+            ct=self.headers['Content-Type']
+        try:
+            location = dc.put(uri,body,ct)
+        except DAV_Error, (ec,dd):
+            return self.send_status(ec)
+
+        headers = {}
+        if location:
+            headers['Location'] = location
+
+        try:
+            etag = dc.get_prop(location or uri, "DAV:", "getetag")
+            headers['ETag'] = etag
+        except:
+            pass
+
+        self.send_body(None, '201', 'Created', '', headers=headers)
+
 
 try:
     from service.http_server import reg_http_service,OpenERPAuthProvider