Changeset 113 for Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp

Timestamp:

10/28/07 23:41:34 (1 year ago)

Author:

daboo

Message:

Calendar ctag handling. Don't list the calendars/address books when first starting up if
we have a fresh cache.

Files:

• Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp (modified) (12 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Calendar_Store/Protocols/CCalendarProtocol.cpp

@@ -32 +32 @@
 #include "CConnectionManager.h"
 #include "CLocalCalendarClient.h"
+#include "CPasswordManager.h"
 #include "CPreferences.h"
 #include "CWebDAVCalendarClient.h"
@@ -38 +39 @@
 
 #include "CICalendarSync.h"
+#include "CICalendarDateTime.h"
+#include "CICalendarDuration.h"
 
 #include "XMLDocument.h"
@@ -60 +63 @@
         mCacheIsPrimary = false;
         mSyncingList = false;
+        mListedFromCache = false;
 
         // Only WebDAV servers can disconnect
@@ -482 +486 @@
                         // Only bother if it contains something
                         if (!auth->GetPswd().empty())
+                        {
                                 CCalendarProtocol::SetCachedPswd(auth->GetUID(), auth->GetPswd());
+                                CPasswordManager::GetManager()->AddPassword(GetAccount(), auth->GetPswd());
+                        }
                 }
 
@@ -569 +576 @@
         else
         {
-                // Now get new list
-                mClient->_ListCalendars(&mStoreRoot);
-
-                // Always keep disconnected cache list in sync with server
-                if (mCacheClient != NULL)
-                {
-                        DumpCalendars();
-                }
+                // First try the disconnected cache - but only use if current
+                if (mListedFromCache || ((mCacheClient == NULL) || !ReadCalendars(true)))
+                {
+                        // Now get new list
+                        mClient->_ListCalendars(&mStoreRoot);
+
+                        // Always keep disconnected cache list in sync with server
+                        if (mCacheClient != NULL)
+                        {
+                                DumpCalendars();
+                        }
+                }
+                else
+                        mListedFromCache = true;
         }
 
@@ -1006 +1019 @@
                 //  2.1 Add new components to server and cache info
                 //  2.2 Remove deleted components from server and cached server info if still present on server
-                //  2.3 Cache info for changed items for later sync
+                //  2.3 Cache info for changed items for later sync (or change them immediately if the server has not changed
                 //
                 // 3. Scan list of local components
@@ -1020 +1033 @@
                 // 4. Copy remaining items in server set to local cache - they are new items
                 //
+                // We only need to do steps 3 & 4 if the data on the server is known to have changed.
+                //
                 
                 // Now do it...
@@ -1025 +1040 @@
                 // Step 1
                 cdstrmap comps;
-                mClient->_GetComponentInfo(node, cal, comps);
+                bool server_changed = mClient->_CalendarChanged(node, cal);
+                if (server_changed)
+                        mClient->_GetComponentInfo(node, cal, comps);
+                else
+                {
+                        mCacheClient->_ReadFullCalendar(node, cal);
+                }
                 
                 // Step 2
@@ -1063 +1084 @@
                         // Step 2.3
                         else if ((*iter).second.GetAction() == iCal::CICalendarComponentRecord::eChanged)
-                                cache_changed.insert(cdstrmap::value_type((*iter).second.GetRURL(), (*iter).second.GetETag()));
+                        {
+                                if (server_changed)
+                                        cache_changed.insert(cdstrmap::value_type((*iter).second.GetRURL(), (*iter).second.GetETag()));
+                                else
+                                {
+                                        // Change it on the server
+                                        const iCal::CICalendarComponent* comp = cal.GetComponentByKey((*iter).first);
+                                        mClient->_ChangeComponent(node, cal, *comp);
+                                        cache_changed.insert(cdstrmap::value_type((*iter).second.GetRURL(), (*iter).second.GetETag()));
+                                }
+                        }
                 }
                 
                 
                 // Now do sync
-                
-                // Get component info from cache
-                iCal::CICalendarComponentDBList dbs;
-                cal.GetAllDBs(dbs);
-                cdstrvect component_keys;
-                for(iCal::CICalendarComponentDBList::const_iterator iter1 = dbs.begin(); iter1 != dbs.end(); iter1++)
-                {
-                        for(iCal::CICalendarComponentDB::const_iterator iter2 = (*iter1)->begin(); iter2 != (*iter1)->end(); iter2++)
+                if (server_changed)
+                {
+                        // Get component info from cache
+                        iCal::CICalendarComponentDBList dbs;
+                        cal.GetAllDBs(dbs);
+                        cdstrvect component_keys;
+                        for(iCal::CICalendarComponentDBList::const_iterator iter1 = dbs.begin(); iter1 != dbs.end(); iter1++)
                         {
-                                component_keys.push_back((*iter2).second->GetMapKey());
+                                for(iCal::CICalendarComponentDB::const_iterator iter2 = (*iter1)->begin(); iter2 != (*iter1)->end(); iter2++)
+                                {
+                                        component_keys.push_back((*iter2).second->GetMapKey());
+                                }
                         }
-                }
-                
-                // Step 3
-                cdstrset matching_components;
-                for(cdstrvect::const_iterator iter = component_keys.begin(); iter != component_keys.end(); iter++)
-                {
-                        iCal::CICalendarComponent* cache_comp = cal.GetComponentByKey(*iter);
-                        if (cache_comp == NULL)
-                                continue;
-
-                        // Get this components RURL
-                        cdstring cache_rurl = cache_comp->GetRURL();
-                        cdstring cache_etag = cache_comp->GetETag();
                         
-                        // Get the server info
-                        cdstring server_rurl;
-                        cdstring server_etag;
-                        cdstrmap::const_iterator found = comps.find(cache_rurl);
-                        if (found != comps.end())
+                        // Step 3
+                        cdstrset matching_components;
+                        for(cdstrvect::const_iterator iter = component_keys.begin(); iter != component_keys.end(); iter++)
                         {
-                                server_rurl = (*found).first;
-                                server_etag = (*found).second;
-                        }
-
-                        // Step 3.1
-                        if (cache_added.count(cache_rurl) != 0)
-                                continue;
-                        
-                        // Step 3.2
-                        else if (cache_changed.count(cache_rurl) != 0)
-                        {
-                                // Step 3.2.1
-                                if (cache_etag == server_etag)
+                                iCal::CICalendarComponent* cache_comp = cal.GetComponentByKey(*iter);
+                                if (cache_comp == NULL)
+                                        continue;
+
+                                // Get this components RURL
+                                cdstring cache_rurl = cache_comp->GetRURL();
+                                cdstring cache_etag = cache_comp->GetETag();
+                                
+                                // Get the server info
+                                cdstring server_rurl;
+                                cdstring server_etag;
+                                cdstrmap::const_iterator found = comps.find(cache_rurl);
+                                if (found != comps.end())
                                 {
-                                        // Write changed cache component to server
-                                        mClient->_ChangeComponent(node, cal, *cache_comp);
+                                        server_rurl = (*found).first;
+                                        server_etag = (*found).second;
                                 }
+
+                                // Step 3.1
+                                if (cache_added.count(cache_rurl) != 0)
+                                        continue;
                                 
-                                // Step 3.2.2
-                                else
+                                // Step 3.2
+                                else if (cache_changed.count(cache_rurl) != 0)
                                 {
-                                        // Do iCal SEQ etc comparison
+                                        // Step 3.2.1
+                                        if (cache_etag == server_etag)
+                                        {
+                                                // Write changed cache component to server
+                                                mClient->_ChangeComponent(node, cal, *cache_comp);
+                                        }
                                         
-                                        // First read in component from server into temp calendar
-                                        iCal::CICalendar tempcal;
-                                        iCal::CICalendarComponent* server_comp = mClient->_ReadComponent(node, tempcal, server_rurl);
-                                        if (server_comp != NULL)
+                                        // Step 3.2.2
+                                        else
                                         {
-                                                int result = iCal::CICalendarSync::CompareComponentVersions(server_comp, cache_comp);
+                                                // Do iCal SEQ etc comparison
                                                 
-                                                if (result == 1)
+                                                // First read in component from server into temp calendar
+                                                iCal::CICalendar tempcal;
+                                                iCal::CICalendarComponent* server_comp = mClient->_ReadComponent(node, tempcal, server_rurl);
+                                                if (server_comp != NULL)
                                                 {
-                                                        // Cache is newer than server - cache overwrites to server
-                                                        mClient->_ChangeComponent(node, cal, *cache_comp);
-                                                }
-                                                else if (result == -1)
-                                                {
-                                                        // Cache is older than server - server overwrites cache
-
-                                                        // Remove the cached component first
-                                                        cal.RemoveComponentByKey(cache_comp->GetMapKey());
-                                                        cache_comp = NULL;
+                                                        int result = iCal::CICalendarSync::CompareComponentVersions(server_comp, cache_comp);
                                                         
-                                                        // Copy component from server into local cache effectively replacing old one
-                                                        iCal::CICalendarComponent* new_comp = server_comp->clone();
-                                                        new_comp->SetCalendar(cal.GetRef());
-                                                        cal.AddComponent(new_comp);
+                                                        if (result == 1)
+                                                        {
+                                                                // Cache is newer than server - cache overwrites to server
+                                                                mClient->_ChangeComponent(node, cal, *cache_comp);
+                                                        }
+                                                        else if (result == -1)
+                                                        {
+                                                                // Cache is older than server - server overwrites cache
+
+                                                                // Remove the cached component first
+                                                                cal.RemoveComponentByKey(cache_comp->GetMapKey());
+                                                                cache_comp = NULL;
+                                                                
+                                                                // Copy component from server into local cache effectively replacing old one
+                                                                iCal::CICalendarComponent* new_comp = server_comp->clone();
+                                                                new_comp->SetCalendar(cal.GetRef());
+                                                                cal.AddComponent(new_comp);
+                                                        }
                                                 }
                                         }
                                 }
+                                
+                                // Step 3.3
+                                else if (!server_rurl.empty())
+                                {
+                                        // Step 3.3.1
+                                        if (cache_etag != server_etag)
+                                        {
+                                                // Copy from server to cache overwriting cache value
+                                                
+                                                // Remove the cached component first
+                                                cal.RemoveComponentByKey(cache_comp->GetMapKey());
+                                                cache_comp = NULL;
+                                                
+                                                // Read component from server into local cache effectively replacing old one
+                                                mClient->_ReadComponent(node, cal, server_rurl);
+                                        }
+                                }
+                                
+                                // Step 3.4
+                                else
+                                {
+                                        // comp is deleted in this call
+                                        cal.RemoveComponentByKey(cache_comp->GetMapKey());
+                                        cache_comp = NULL;
+                                }
+                                
+                                // Step 3.5
+                                if (!server_rurl.empty())
+                                        matching_components.insert(server_rurl);
                         }
                         
-                        // Step 3.3
-                        else if (!server_rurl.empty())
+                        // Step 4
+                        cdstrvect rurls;
+                        for(cdstrmap::const_iterator iter = comps.begin(); iter != comps.end(); iter++)
                         {
-                                // Step 3.3.1
-                                if (cache_etag != server_etag)
-                                {
-                                        // Copy from server to cache overwriting cache value
-                                        
-                                        // Remove the cached component first
-                                        cal.RemoveComponentByKey(cache_comp->GetMapKey());
-                                        cache_comp = NULL;
-                                        
-                                        // Read component from server into local cache effectively replacing old one
-                                        mClient->_ReadComponent(node, cal, server_rurl);
-                                }
+                                cdstrset::const_iterator found = matching_components.find((*iter).first);
+                                if (found == matching_components.end())
+                                        rurls.push_back((*iter).first);
                         }
-                        
-                        // Step 3.4
-                        else
-                        {
-                                // comp is deleted in this call
-                                cal.RemoveComponentByKey(cache_comp->GetMapKey());
-                                cache_comp = NULL;
-                        }
-                        
-                        // Step 3.5
-                        if (!server_rurl.empty())
-                                matching_components.insert(server_rurl);
-                }
-                
-                // Step 4
-                cdstrvect rurls;
-                for(cdstrmap::const_iterator iter = comps.begin(); iter != comps.end(); iter++)
-                {
-                        cdstrset::const_iterator found = matching_components.find((*iter).first);
-                        if (found == matching_components.end())
-                                rurls.push_back((*iter).first);
-                }
-
-                // Read components from server into local cache as its a new one on the server
-                if (rurls.size() != 0)
-                        mClient->_ReadComponents(node, cal, rurls);
+
+                        // Read components from server into local cache as its a new one on the server
+                        if (rurls.size() != 0)
+                                mClient->_ReadComponents(node, cal, rurls);
+                }
 
                 // Clear out cache recording
                 cal.ClearRecording();
                 
+                // Get the current server sync token
+                mClient->_UpdateSyncToken(node, cal);
+
                 // Now write back cache
-                if (mCacheClient->_TouchCalendar(node))
+                if (!mCacheClient->_TouchCalendar(node))
                         DumpCalendars();
                 mCacheClient->_WriteFullCalendar(node, cal);
@@ -1742 +1778 @@
         xmllib::XMLObject::WriteAttribute(doc->GetRoot(), cXMLAttribute_version, (uint32_t)1);
         
+        // Store the current date
+        iCal::CICalendarDateTime dt = iCal::CICalendarDateTime::GetNowUTC();
+        dt.SetDateOnly(true);
+        xmllib::XMLObject::WriteAttribute(doc->GetRoot(), cXMLAttribute_datestamp, dt.GetText());
+        
         // Now add each node (and child nodes) to XML doc
         mStoreRoot.WriteXML(doc.get(), doc->GetRoot(), true);
@@ -1750 +1791 @@
 }
 
-void CCalendarProtocol::ReadCalendars()
-{
+bool CCalendarProtocol::ReadCalendars(bool only_if_current)
+{
+        bool is_current = false;
         cdstring list_name = mOfflineCWD + cCalendarListName;
         
@@ -1764 +1806 @@
                 xmllib::XMLNode* root = parser.Document()->GetRoot();
                 if (!root->CompareFullName(cXMLElement_calendarlist))
-                        return;
+                        return is_current;
                 
-                // Now have store root read in all children
-                mStoreRoot.ReadXML(root, true);
-
-                // Always cache the disconnected state
-                mStoreRoot.TestDisconnectCache();
-        }
-}
+                // Get the datestamp
+                cdstring dtstamp;
+                if (xmllib::XMLObject::ReadAttribute(root, cXMLAttribute_datestamp, dtstamp))
+                {
+                        iCal::CICalendarDateTime dtnow = iCal::CICalendarDateTime::GetNowUTC();
+                        dtnow.SetDateOnly(true);
+
+                        iCal::CICalendarDateTime dt;
+                        dt.Parse(dtstamp);
+                        
+                        iCal::CICalendarDuration diff = dtnow - dt;
+                        is_current = (diff.GetTotalSeconds() <= 48 * 60 * 60);
+                }
+
+                if (!only_if_current || is_current)
+                {
+                        // Now have store root read in all children
+                        mStoreRoot.ReadXML(root, true);
+
+                        // Always cache the disconnected state
+                        if (IsDisconnected() || mCacheIsPrimary)
+                                mStoreRoot.TestDisconnectCache();
+                }
+        }
+        
+        return is_current;
+}