Changeset 169

Timestamp:

07/04/08 14:57:53 (3 months ago)

Author:

cyrusdaboo

Message:

Only read web calendars when the etag has changed. Also extract user value from web calendar URIs
and use that for authentication.

Location:

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients

Files:

• CCalDAVCalendarClient.cpp (modified) (1 diff)
• CCalDAVCalendarClient.h (modified) (1 diff)
• CCalendarClient.h (modified) (1 diff)
• CLocalCalendarClient.cpp (modified) (1 diff)
• CLocalCalendarClient.h (modified) (1 diff)
• CWebDAVCalendarClient.cpp (modified) (5 diffs)
• CWebDAVCalendarClient.h (modified) (1 diff)

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.cpp

@@ -320 +320 @@
 }
 
-void CCalDAVCalendarClient::_ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal)
+void CCalDAVCalendarClient::_ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed)
 {
         // Start UI action

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CCalDAVCalendarClient.h

@@ -64 +64 @@
         virtual void _UpdateSyncToken(const CCalendarStoreNode& node, iCal::CICalendar& cal);
 
-        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);
+        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed=false);
         virtual void _WriteFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);
 

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CCalendarClient.h

@@ -63 +63 @@
         virtual void _SizeCalendar(CCalendarStoreNode& node) = 0;
 
-        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal) = 0;
+        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed=false) = 0;
         virtual void _WriteFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal) = 0;
 

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CLocalCalendarClient.cpp

@@ -526 +526 @@
 }
 
-void CLocalCalendarClient::_ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal)
+void CLocalCalendarClient::_ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed)
 {
         // Get name for new file

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CLocalCalendarClient.h

@@ -71 +71 @@
         virtual void _SizeCalendar(CCalendarStoreNode& node);
         
-        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);
+        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed=false);
         virtual void _WriteFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);
 

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CWebDAVCalendarClient.cpp

@@ -673 +673 @@
 }
 
-void CWebDAVCalendarClient::_ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal)
+void CWebDAVCalendarClient::_ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed)
 {
         // Start UI action
@@ -692 +692 @@
                 acct->SetServerIP(parsed.Server());
                 
+                // Handle authentication
+                if (!parsed.User().empty())
+                {
+                        acct->GetAuthenticatorUserPswd()->SetUID(parsed.User());
+                }
+
                 // Set TLS type
                 if ((parsed.SchemeType() == CURL::eHTTP) || (parsed.SchemeType() == CURL::eWebcal))
@@ -713 +719 @@
         // Create WebDAV GET
         auto_ptr<http::webdav::CWebDAVGet> request(new http::webdav::CWebDAVGet(this, rurl));
+        if (if_changed)
+                request->SetETag(cal.GetETag(), false);
         http::CHTTPOutputDataString dout;
         request->SetData(&dout);
@@ -719 +727 @@
         RunSession(request.get());
         
-        
         // Check response status
+        bool changed = true;
         switch(request->GetStatusCode())
         {
         case http::eStatus_OK:
                 // Do default action
+                break;
+        case http::eStatus_NotModified:
+                // Nothing more to do
+                changed = false;
                 break;
         default:
@@ -732 +744 @@
         }
 
-        // Read calendar from file
-        cdstring data = dout.GetData();
-        std::istrstream is(data.c_str());
-        cal.Parse(is);
-        
-        // Update ETag
-        if (request->GetNewETag() != NULL)
-        {
-                cdstring temp(*request->GetNewETag());
-
-                // Handle server bug: ETag value MUST be quoted per HTTP/1.1 €3.11
-                if (!temp.isquoted())
-                        temp.quote(true);
-                
-                cal.SetETag(temp);
-        }
-        else
-                cal.SetETag(cdstring::null_str);
-        
-        // Check read-only status
-        auto_ptr<http::webdav::CWebDAVOptions> optrequest(new http::webdav::CWebDAVOptions(this, rurl));
-
-        // Process it
-        RunSession(optrequest.get());
-        
-        
-        // Check response status
-        switch(optrequest->GetStatusCode())
-        {
-        case http::eStatus_OK:
-        case http::eStatus_NoContent:
-                // Do default action
-                break;
-        case eStatus_NotImplemented:
-                // Ignore failure
-                return;
-        default:
-                // Handle error and exit here
-                HandleHTTPError(optrequest.get());
-                return;
-        }
-
-        // Look for PUT
-        cal.SetReadOnly(!optrequest->IsAllowed(http::cRequestPUT));
+        if (changed)
+        {
+                // Read calendar from file
+                cdstring data = dout.GetData();
+                std::istrstream is(data.c_str());
+                cal.Parse(is);
+                
+                // Update ETag
+                if (request->GetNewETag() != NULL)
+                {
+                        cdstring temp(*request->GetNewETag());
+
+                        // Handle server bug: ETag value MUST be quoted per HTTP/1.1 €3.11
+                        if (!temp.isquoted())
+                                temp.quote(true);
+                        
+                        cal.SetETag(temp);
+                }
+                else
+                        cal.SetETag(cdstring::null_str);
+                
+                // Check read-only status
+                auto_ptr<http::webdav::CWebDAVOptions> optrequest(new http::webdav::CWebDAVOptions(this, rurl));
+
+                // Process it
+                RunSession(optrequest.get());
+                
+                
+                // Check response status
+                switch(optrequest->GetStatusCode())
+                {
+                case http::eStatus_OK:
+                case http::eStatus_NoContent:
+                        // Do default action
+                        break;
+                case eStatus_NotImplemented:
+                        // Ignore failure
+                        return;
+                default:
+                        // Handle error and exit here
+                        HandleHTTPError(optrequest.get());
+                        return;
+                }
+
+                // Look for PUT
+                cal.SetReadOnly(!optrequest->IsAllowed(http::cRequestPUT));
+        }
 }
 

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Clients/CWebDAVCalendarClient.h

@@ -80 +80 @@
         virtual void _SizeCalendar(CCalendarStoreNode& node);
 
-        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);
+        virtual void _ReadFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal, bool if_changed=false);
         virtual void _WriteFullCalendar(const CCalendarStoreNode& node, iCal::CICalendar& cal);