Attachment 74139 Details for Bug 60235 – Updated patch for getDatabases in ActiveSync

[patch] Updated patch for getDatabases in ActiveSync

updated-getDatabases.patch (text/plain), 7.19 KB, created by Graham Cobb on 2013-02-03 14:42:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Graham Cobb

Created: 2013-02-03 14:42:51 UTC

Size: 7.19 KB

patch

obsolete

>diff --git a/src/backends/activesync/ActiveSyncSource.cpp b/src/backends/activesync/ActiveSyncSource.cpp
>index 0c50a1a..f4e42ee 100644
>--- a/src/backends/activesync/ActiveSyncSource.cpp
>+++ b/src/backends/activesync/ActiveSyncSource.cpp
>@@ -32,6 +32,7 @@
> #include <errno.h>
> 
> #include <boost/algorithm/string.hpp>
>+#include <boost/range/adaptors.hpp>
> 
> /* #include <eas-connection-errors.h> */
> #include <syncevo/declarations.h>
>@@ -39,6 +40,7 @@ SE_BEGIN_CXX
> 
> void EASItemUnref(EasItemInfo *info) { g_object_unref(&info->parent_instance); }
> void GStringUnref(char *str) { g_free(str); }
>+void EASFolderUnref(EasFolder *f) { g_object_unref(&f->parent_instance); }
> 
> void ActiveSyncSource::enableServerMode()
> {
>@@ -50,11 +52,127 @@ bool ActiveSyncSource::serverModeEnabled() const
>     return m_operations.m_loadAdminData;
> }
> 
>+/* Recursively work out full path name */
>+std::string ActiveSyncSource::get_collection_path(const std::string parentId, const std::string name) {
>+  if (parentId == "0") return name;
>+
>+  if (!m_collections[parentId].pathFound) {
>+    m_collections[parentId].pathName = get_collection_path(m_collections[parentId].parentId, m_collections[parentId].name);
>+    m_folder_paths[m_collections[parentId].pathName] = m_collections[parentId].collectionId;
>+    m_collections[parentId].pathFound = true;
>+  }
>+
>+  return m_collections[parentId].pathName + "/" + name;
>+}
>+
>+void ActiveSyncSource::findCollections(const std::string account, const bool force_update)
>+{
>+    GErrorCXX gerror;
>+    EasSyncHandler *handler;
>+    EASFoldersCXX folders;
>+
>+    if (!m_collections.empty()) {
>+      if (!force_update) return;
>+      m_collections.clear();
>+      m_folder_paths.clear();
>+    }
>+
>+    /* Fetch the folders */
>+    handler = eas_sync_handler_new(account.c_str());
>+    if (!handler) throwError("findCollections cannot allocate sync handler");
>+
>+    if (!eas_sync_handler_get_folder_list (handler,
>+					   force_update,
>+					   folders,
>+					   NULL,
>+					   gerror)) {
>+      g_object_unref(handler);
>+      gerror.throwError("fetching folder list");
>+    }
>+    g_object_unref(handler);
>+
>+    /* Save the Collections */
>+    BOOST_FOREACH(EasFolder *folder, folders) {
>+      m_collections[folder->folder_id].collectionId = folder->folder_id;
>+      m_collections[folder->folder_id].name = folder->display_name;
>+      m_collections[folder->folder_id].parentId = folder->parent_id;
>+      m_collections[folder->folder_id].type = folder->type;
>+    }
>+    
>+    /* Work out the full paths */
>+    BOOST_FOREACH(Collection &coll, m_collections | boost::adaptors::map_values) {
>+      if (!coll.pathFound) {
>+	coll.pathName = get_collection_path(coll.parentId, coll.name);
>+	m_folder_paths[coll.pathName] = coll.collectionId;
>+	coll.pathFound = true;
>+      }
>+    }
>+}
>+
>+static int get_folder_type (const unsigned collection_type) {
>+  switch (collection_type) {
>+  case EAS_FOLDER_TYPE_DEFAULT_INBOX:
>+  case EAS_FOLDER_TYPE_DEFAULT_DRAFTS:
>+  case EAS_FOLDER_TYPE_DEFAULT_DELETED_ITEMS:
>+  case EAS_FOLDER_TYPE_DEFAULT_SENT_ITEMS:
>+  case EAS_FOLDER_TYPE_DEFAULT_OUTBOX:
>+  case EAS_FOLDER_TYPE_USER_CREATED_MAIL:
>+    return EAS_ITEM_MAIL;
>+  case EAS_FOLDER_TYPE_DEFAULT_TASKS:
>+  case EAS_FOLDER_TYPE_USER_CREATED_TASKS:
>+    return EAS_ITEM_TODO;
>+  case EAS_FOLDER_TYPE_DEFAULT_CALENDAR:
>+  case EAS_FOLDER_TYPE_USER_CREATED_CALENDAR:
>+    return EAS_ITEM_CALENDAR;
>+  case EAS_FOLDER_TYPE_DEFAULT_CONTACTS:
>+  case EAS_FOLDER_TYPE_USER_CREATED_CONTACTS:
>+    return EAS_ITEM_CONTACT;
>+  case EAS_FOLDER_TYPE_DEFAULT_NOTES:
>+  case EAS_FOLDER_TYPE_USER_CREATED_NOTES:
>+    //TODO: implement memos
>+  case EAS_FOLDER_TYPE_DEFAULT_JOURNAL:
>+  case EAS_FOLDER_TYPE_USER_CREATED_JOURNAL:
>+  case EAS_FOLDER_TYPE_UNKNOWN:
>+  case EAS_FOLDER_TYPE_RECIPIENT_CACHE:
>+  default:
>+    return -1;
>+  }
>+}
>+
>+static bool collection_is_default (const unsigned collection_type) {
>+  return collection_type == EAS_FOLDER_TYPE_DEFAULT_INBOX ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_DRAFTS ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_DELETED_ITEMS ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_SENT_ITEMS ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_OUTBOX ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_TASKS ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_CALENDAR ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_CONTACTS ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_NOTES ||
>+    collection_type == EAS_FOLDER_TYPE_DEFAULT_JOURNAL;
>+}
>+
> ActiveSyncSource::Databases ActiveSyncSource::getDatabases()
> {
>     Databases result;
>-    // empty string always selects the default database
>-    result.push_back(Database("", "", true));
>+    // do a scan if username is set
>+    std::string account = m_context->getSyncUsername();
>+
>+    if (!account.empty()) {
>+
>+      findCollections(account, true);
>+
>+      BOOST_FOREACH(Collection coll, m_collections | boost::adaptors::map_values) {
>+	if (get_folder_type(coll.type) == getEasType()) {
>+	  result.push_back(Database(coll.pathName, coll.collectionId, collection_is_default(coll.type)));
>+	}
>+      }
>+
>+    } else {
>+      result.push_back(Database("to scan, specify --print-databases username=<account> backend=\""+getSourceType().m_backend+"\"",
>+                                  ""));
>+    }
>+
>     return result;
> }
> 
>diff --git a/src/backends/activesync/ActiveSyncSource.h b/src/backends/activesync/ActiveSyncSource.h
>index ffeed23..c944a2e 100644
>--- a/src/backends/activesync/ActiveSyncSource.h
>+++ b/src/backends/activesync/ActiveSyncSource.h
>@@ -38,6 +38,7 @@
> 
> #include "libeassync.h"
> #include <eas-item-info.h>
>+#include <eas-folder.h>
> 
> #include <syncevo/declarations.h>
> SE_BEGIN_CXX
>@@ -179,6 +180,8 @@ class ActiveSyncSource :
>     void setStartSyncKey(const std::string &startSyncKey) { m_startSyncKey = startSyncKey; }
>     std::string getCurrentSyncKey() { return m_currentSyncKey; }
>     void setCurrentSyncKey(const std::string &currentSyncKey) { m_currentSyncKey = currentSyncKey; }
>+    void findCollections(const std::string account, bool force_update);
>+    std::string get_collection_path(const std::string parentId, const std::string name);
> 
>     boost::shared_ptr<ConfigNode> m_itemNode;
> 
>@@ -212,6 +215,22 @@ class ActiveSyncSource :
>      * changes are made (if doing change tracking)
>      */
>     std::map<std::string, std::string> m_items;
>+
>+    /**
>+     * list of folders
>+     */
>+    typedef struct Collection {
>+      std::string collectionId;
>+      std::string name;
>+      std::string parentId;
>+      std::string pathName;
>+      unsigned type;
>+      bool pathFound;
>+
>+      Collection() {pathFound = false;}
>+    } collection;
>+    std::map<std::string, Collection> m_collections; // Indexed by collectionID
>+    std::map<std::string, std::string> m_folder_paths; // Maps pathName to collectionId
> };
> 
> class ActiveSyncContactSource : public ActiveSyncSource
>@@ -263,6 +282,11 @@ typedef GListCXX<char, GSList, GStringUnref> EASIdsCXX;
> /** non-copyable smart pointer to an EasItemInfo, unrefs when going out of scope */
> typedef eptr<EasItemInfo, GObject> EASItemPtr;
> 
>+void EASFolderUnref(EasFolder *f);
>+
>+/** non-copyable list of EasFolder pointers, owned by list */
>+typedef GListCXX<EasFolder, GSList, EASFolderUnref> EASFoldersCXX;
>+
> SE_END_CXX
> 
> #endif // ENABLE_ACTIVESYNC

Actions: View | Splinter Review

Attachments on bug 60235: 74136 | 74139 | 74199

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.