From: Mikel Astiz <mikel.astiz(a)bmw-carit.de&gt; This new backend represents a phonebook accessible using the Bluetooth PBAP profile. --- src/backends/pbap/PbapSyncSource.cpp | 119 +++++++++++++++++++++ src/backends/pbap/PbapSyncSource.h | 62 +++++++++++ src/backends/pbap/PbapSyncSourceRegister.cpp | 143 ++++++++++++++++++++++++++ src/backends/pbap/configure-sub.in | 36 +++++++ src/backends/pbap/pbap.am | 29 +++++ 5 files changed, 389 insertions(+), 0 deletions(-) create mode 100644 src/backends/pbap/PbapSyncSource.cpp create mode 100644 src/backends/pbap/PbapSyncSource.h create mode 100644 src/backends/pbap/PbapSyncSourceRegister.cpp create mode 100644 src/backends/pbap/configure-sub.in create mode 100644 src/backends/pbap/pbap.am diff --git a/src/backends/pbap/PbapSyncSource.cpp b/src/backends/pbap/PbapSyncSource.cpp new file mode 100644 index 0000000..d2e689d --- /dev/null +++ b/src/backends/pbap/PbapSyncSource.cpp @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2007-2009 Patrick Ohly <patrick.ohly(a)gmx.de&gt; + * Copyright (C) 2009 Intel Corporation + * Copyright (C) 2012 BMW Car IT GmbH. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) version 3. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include "config.h" + +#ifdef ENABLE_PBAP + +#include "PbapSyncSource.h" + +// SyncEvolution includes a copy of Boost header files. +// They are safe to use without creating additional +// build dependencies. boost::filesystem requires a +// library and therefore is avoided here. Some +// utility functions from SyncEvolution are used +// instead, plus standard C/Posix functions. +#include <boost/algorithm/string/case_conv.hpp> +#include <boost/tokenizer.hpp> + +#include <errno.h> +#include <unistd.h> + +#include <syncevo/util.h> + +#include "src/gdbusxx/gdbus-cxx-bridge.h" + +#include <boost/algorithm/string/predicate.hpp> + +#include <syncevo/SyncContext.h> +#include <syncevo/declarations.h> +SE_BEGIN_CXX + +PbapSyncSource::PbapSyncSource(const SyncSourceParams &params) : + TrackingSyncSource(params) +{ +} + +std::string PbapSyncSource::getMimeType() const +{ + return "text/x-vcard"; +} + +std::string PbapSyncSource::getMimeVersion() const +{ + return "2.1"; +} + +void PbapSyncSource::open() +{ + const string &database = getDatabaseID(); + const string prefix("obex-bt://"); + + if (!boost::starts_with(database, prefix)) { + throwError("database should specifiy device address (obex-bt://<bt-addr>)"); + } + + std::string address = database.substr(prefix.size()); +} + +bool PbapSyncSource::isEmpty() +{ + return true; +} + +void PbapSyncSource::close() +{ +} + +PbapSyncSource::Databases PbapSyncSource::getDatabases() +{ + Databases result; + + result.push_back(Database("select database via bluetooth address", + "[obex-bt://]<bt-addr>")); + return result; +} + +void PbapSyncSource::listAllItems(RevisionMap_t &revisions) +{ +} + +void PbapSyncSource::readItem(const string &uid, std::string &item, bool raw) +{ +} + +TrackingSyncSource::InsertItemResult PbapSyncSource::insertItem(const string &uid, const std::string &item, bool raw) +{ + throw std::runtime_error("Operation not supported"); +} + +void PbapSyncSource::removeItem(const string &uid) +{ + throw std::runtime_error("Operation not supported"); +} + +SE_END_CXX + +#endif /* ENABLE_PBAP */ + +#ifdef ENABLE_MODULES +# include "PbapSyncSourceRegister.cpp" +#endif diff --git a/src/backends/pbap/PbapSyncSource.h b/src/backends/pbap/PbapSyncSource.h new file mode 100644 index 0000000..7074b5d --- /dev/null +++ b/src/backends/pbap/PbapSyncSource.h @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2007-2009 Patrick Ohly <patrick.ohly(a)gmx.de&gt; + * Copyright (C) 2012 BMW Car IT GmbH. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) version 3. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#ifndef INCL_PBAPSYNCSOURCE +#define INCL_PBAPSYNCSOURCE + +#include <syncevo/TrackingSyncSource.h> + +#ifdef ENABLE_PBAP + +#include <memory> +#include <boost/noncopyable.hpp> + +#include <syncevo/declarations.h> +SE_BEGIN_CXX + +class PbapSyncSource : public TrackingSyncSource, private boost::noncopyable +{ + public: + PbapSyncSource(const SyncSourceParams &params); + + + protected: + /* implementation of SyncSource interface */ + virtual void open(); + virtual bool isEmpty(); + virtual void close(); + virtual Databases getDatabases(); + virtual std::string getMimeType() const; + virtual std::string getMimeVersion() const; + + /* implementation of TrackingSyncSource interface */ + virtual void listAllItems(RevisionMap_t &revisions); + //virtual InsertItemResult insertItem(const string &luid, const std::string &item, bool raw); + virtual InsertItemResult insertItem(const string &luid, const std::string &item, bool raw); + void readItem(const std::string &luid, std::string &item, bool raw); + virtual void removeItem(const string &uid); + + private: +}; + +SE_END_CXX + +#endif // ENABLE_PBAP +#endif // INCL_PBAPSYNCSOURCE diff --git a/src/backends/pbap/PbapSyncSourceRegister.cpp b/src/backends/pbap/PbapSyncSourceRegister.cpp new file mode 100644 index 0000000..67c1505 --- /dev/null +++ b/src/backends/pbap/PbapSyncSourceRegister.cpp @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2008-2009 Patrick Ohly <patrick.ohly(a)gmx.de&gt; + * Copyright (C) 2009 Intel Corporation + * Copyright (C) 2012 BMW Car IT GmbH. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) version 3. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include "PbapSyncSource.h" +#include "test.h" + +#include <syncevo/declarations.h> +SE_BEGIN_CXX + +static SyncSource *createSource(const SyncSourceParams &params) +{ + SE_LOG_DEBUG(NULL, NULL, "---> PBAP::createSource()"); + + SourceType sourceType = SyncSource::getSourceType(params.m_nodes); + // The string returned by getSourceType() is always the one + // registered as main Aliases() below. + bool isMe = sourceType.m_backend == "PBAP Address Book"; + +#ifndef ENABLE_PBAP + // tell SyncEvolution if the user wanted to use a disabled sync source, + // otherwise let it continue searching + return isMe ? RegisterSyncSource::InactiveSource : NULL; +#else + // Also recognize one of the standard types? + // Not in the PbapSyncSource! + bool maybeMe = false /* sourceType.m_backend == "addressbook" */; + + if (isMe || maybeMe) { + return new PbapSyncSource(params); + } + return NULL; +#endif +} + +static RegisterSyncSource registerMe("One-way sync using PBAP", +#ifdef ENABLE_PBAP + true, +#else + false, +#endif + createSource, + "One-way sync using PBAP = pbap\n" + " Requests phonebook entries using PBAP profile, and thus\n" + " supporting read-only operations.\n" + " The BT address is selected via database=obex-bt://<bt-addr>.\n", + Values() + + (Aliases("PBAP Address Book") + "pbap")); + +#ifdef ENABLE_PBAP + +// The anonymous namespace ensures that we don't get +// name clashes: although the classes and objects are +// only defined in this file, the methods generated +// for local classes will clash with other methods +// of other classes with the same name if no namespace +// is used. +// +// The code above is not yet inside the anonymous +// name space because it would show up inside +// the CPPUnit unit test names. Use a unique class +// name there. +namespace { +#if 0 +} +#endif + +static class VCard30Test : public RegisterSyncSourceTest { +public: + VCard30Test() : RegisterSyncSourceTest("file_contact", "eds_contact") {} + + virtual void updateConfig(ClientTestConfig &config) const + { + config.m_type = "file:text/vcard:3.0"; + } +} VCard30Test; + +static class ICal20Test : public RegisterSyncSourceTest { +public: + ICal20Test() : RegisterSyncSourceTest("file_event", "eds_event") {} + + virtual void updateConfig(ClientTestConfig &config) const + { + config.m_type = "file:text/calendar:2.0"; + + // A sync source which supports linked items (= recurring + // event with detached exception) is expected to handle + // inserting the parent or child twice by turning the + // second operation into an update. The file backend is + // to dumb for that and therefore fails these tests: + // + // Client::Source::file_event::testLinkedItemsInsertParentTwice + // Client::Source::file_event::testLinkedItemsInsertChildTwice + // + // Disable linked item testing to avoid this. + config.m_sourceKnowsItemSemantic = false; + } +} ICal20Test; + +static class ITodo20Test : public RegisterSyncSourceTest { +public: + ITodo20Test() : RegisterSyncSourceTest("file_task", "eds_task") {} + + virtual void updateConfig(ClientTestConfig &config) const + { + config.m_type = "file:text/calendar:2.0"; + } +} ITodo20Test; + +static class SuperTest : public RegisterSyncSourceTest { +public: + SuperTest() : RegisterSyncSourceTest("file_calendar+todo", "calendar+todo") {} + + virtual void updateConfig(ClientTestConfig &config) const + { + config.m_type = "virtual:text/x-vcalendar"; + config.m_subConfigs = "file_event,file_task"; + } + +} superTest; + +} + +#endif // ENABLE_PBAP + +SE_END_CXX diff --git a/src/backends/pbap/configure-sub.in b/src/backends/pbap/configure-sub.in new file mode 100644 index 0000000..d0ca1f8 --- /dev/null +++ b/src/backends/pbap/configure-sub.in @@ -0,0 +1,36 @@ +dnl -*- mode: Autoconf; -*- +dnl Invoke autogen.sh to produce a configure script. + +dnl Checks for required libraris can go here; none required for simple files. +dnl +dnl This is from the sqlite backend: +dnl PKG_CHECK_MODULES(SQLITE, sqlite3, SQLITEFOUND=yes, [SQLITEFOUND=no]) +dnl AC_SUBST(SQLITE_CFLAGS) +dnl AC_SUBST(SQLITE_LIBS) + +PBAP_CFLAGS= +PBAP_LIBS= +AC_SUBST(PBAP_CFLAGS) +AC_SUBST(BAP_LIBS) + +dnl If additional compile flags are necessary to include the header +dnl files of the backend, then add them here. +BACKEND_CPPFLAGS="$BACKEND_CPPFLAGS $PBAP_CFLAGS" + +dnl name of backend library (there could be more than one per directory), +dnl name of the directory, +dnl help string, +dnl --enable/disable chosen explicitly +dnl default, may depend on availability of prerequisites in more complex backends +SE_ARG_ENABLE_BACKEND(pbap, + pbap, + [AS_HELP_STRING([--disable-pbap], + [disable pbap-based backend which provides one-way synchronization (default on)])], + [enable_pbap="$enableval"], + [enable_pbap="yes"] + ) + +if test "$enable_pbap" = "yes"; then + dnl It's good to check the prerequisites here, in case --enable-pbap was used. + AC_DEFINE(ENABLE_PBAP, 1, [pbap available]) +fi diff --git a/src/backends/pbap/pbap.am b/src/backends/pbap/pbap.am new file mode 100644 index 0000000..15b07e2 --- /dev/null +++ b/src/backends/pbap/pbap.am @@ -0,0 +1,29 @@ +dist_noinst_DATA += src/backends/pbap/configure-sub.in + +src_backends_pbap_lib = src/backends/pbap/syncpbap.la +MOSTLYCLEANFILES += $(src_backends_pbap_lib) +if ENABLE_MODULES +src_backends_pbap_backenddir = $(BACKENDS_DIRECTORY) +src_backends_pbap_backend_LTLIBRARIES = $(src_backends_pbap_lib) +else +noinst_LTLIBRARIES += $(src_backends_pbap_lib) +endif + +src_backends_pbap_src = \ + src/backends/pbap/PbapSyncSource.h \ + src/backends/pbap/PbapSyncSource.cpp + +src_backends_pbap_syncpbap_la_SOURCES = $(src_backends_pbap_src) +src_backends_pbap_syncpbap_la_LIBADD = $(PBAP_LIBS) $(SYNCEVOLUTION_LIBS) +src_backends_pbap_syncpbap_la_LDFLAGS = -module -avoid-version +src_backends_pbap_syncpbap_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) +src_backends_pbap_syncpbap_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS) +src_backends_pbap_syncpbap_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS) + +# If you need special test cases for your sync source, then +# install them here. Here's how the sqlite backend does that: +# +#../../testcases/sqlite_vcard21.vcf: $(FUNAMBOL_SUBDIR)/test/test/testcases/vcard21.vcf +# mkdir -p ${@D} +# perl -e '$$_ = join("", <>); s/^(ADR|TEL|EMAIL|PHOTO).*?(?=^\S)//msg; s/;X-EVOLUTION-UI-SLOT=\d+//g; print;' $< >$@ +#all: ../../testcases/sqlite_vcard21.vcf -- 1.7.6.5

From: Mikel Astiz <mikel.astiz(a)bmw-carit.de&gt; Sending variant values was previously not supported. --- src/gdbusxx/gdbus-cxx-bridge.h | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/gdbusxx/gdbus-cxx-bridge.h b/src/gdbusxx/gdbus-cxx-bridge.h index 95418b5..e696809 100644 --- a/src/gdbusxx/gdbus-cxx-bridge.h +++ b/src/gdbusxx/gdbus-cxx-bridge.h @@ -1565,6 +1565,25 @@ template<class V> struct dbus_traits< std::vector<V> > : public dbus_traits_base }; /** + * Helper class to append variant values into a builder + */ +class append_visitor_dummy_type {}; + +template <class V1, class V2 = append_visitor_dummy_type> struct append_visitor : public boost::static_visitor<> +{ + GVariantBuilder &builder; + append_visitor(GVariantBuilder &b) : builder(b) {} + void operator()(const V1 &v) const + { + dbus_traits<V1>::append(builder, v); + } + void operator()(const V2 &v) const + { + dbus_traits<V2>::append(builder, v); + } +}; + +/** * A boost::variant <V> maps to a dbus variant, only care about values of * type V but will not throw error if type is not matched, this is useful if * application is interested on only a sub set of possible value types @@ -1603,6 +1622,13 @@ template <class V> struct dbus_traits <boost::variant <V> > : public dbus_traits g_variant_unref(varVar); } + static void append(GVariantBuilder &builder, const boost::variant<V> &value) + { + g_variant_builder_open(&builder, G_VARIANT_TYPE(getType().c_str())); + boost::apply_visitor(append_visitor<V>(builder), value); + g_variant_builder_close(&builder); + } + typedef boost::variant<V> host_type; typedef const boost::variant<V> &arg_type; }; @@ -1653,6 +1679,13 @@ template <class V1, class V2> struct dbus_traits <boost::variant <V1, V2> > : pu g_variant_unref(varVar); } + static void append(GVariantBuilder &builder, const boost::variant<V1, V2> &value) + { + g_variant_builder_open(&builder, G_VARIANT_TYPE(getType().c_str())); + boost::apply_visitor(append_visitor<V1, V2>(builder), value); + g_variant_builder_close(&builder); + } + typedef boost::variant<V1, V2> host_type; typedef const boost::variant<V1, V2> &arg_type; }; -- 1.7.6.5

From: Mikel Astiz <mikel.astiz(a)bmw-carit.de&gt; This class is a convenient wrapper hiding the D-Bus method calls, while avoiding compilation dependencies in PbapSyncSource.h. --- src/backends/pbap/PbapSyncSource.cpp | 137 ++++++++++++++++++++++++++++++++++ src/backends/pbap/pbap.am | 6 +- 2 files changed, 140 insertions(+), 3 deletions(-) diff --git a/src/backends/pbap/PbapSyncSource.cpp b/src/backends/pbap/PbapSyncSource.cpp index d2e689d..0747b15 100644 --- a/src/backends/pbap/PbapSyncSource.cpp +++ b/src/backends/pbap/PbapSyncSource.cpp @@ -47,6 +47,143 @@ #include <syncevo/declarations.h> SE_BEGIN_CXX +#define OBC_SERVICE "org.openobex.client" +#define OBC_CLIENT_INTERFACE "org.openobex.Client" +#define OBC_PBAP_INTERFACE "org.openobex.PhonebookAccess" + +class PbapSession { +public: + PbapSession(void); + + void initSession(const std::string &address); + + typedef std::map<std::string, std::string> Content; + void pullAll(Content &dst); + + void shutdown(void); + +private: + GDBusCXX::DBusRemoteObject m_client; + std::auto_ptr<GDBusCXX::DBusRemoteObject> m_session; + + void createSessionCb(const GDBusCXX::DBusObject_t &session, + const string &error); + void selectCb(const string &error); + void removeSessionCb(const string &error); + + static GMainLoop *s_mainloop; + static std::auto_ptr<std::exception> s_mainloop_error; + static void runMainLoop(void); + static void exitMainLoop(std::exception *e = NULL); +}; + +GMainLoop *PbapSession::s_mainloop = NULL; +std::auto_ptr<std::exception> PbapSession::s_mainloop_error; + +void PbapSession::runMainLoop(void) +{ + if(s_mainloop) { + throw std::runtime_error("Busy"); + } + + s_mainloop_error.reset(); + + s_mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(s_mainloop); + + if(s_mainloop_error.get()) { + throw *s_mainloop_error.get(); + } +} + +void PbapSession::exitMainLoop(std::exception *e) +{ + s_mainloop_error.reset(e); + g_main_loop_quit(s_mainloop); + s_mainloop = NULL; +} + +PbapSession::PbapSession(void) : + m_client(GDBusCXX::dbus_get_bus_connection("SESSION", NULL, true, NULL), + "/", OBC_CLIENT_INTERFACE, OBC_SERVICE, true) +{ +} + +void PbapSession::initSession(const std::string &address) +{ + if (m_session.get()) { + return; + } + + typedef std::map<std::string, boost::variant<std::string> > Params; + + GDBusCXX::DBusClientCall1<GDBusCXX::DBusObject_t> + method(m_client, "CreateSession"); + + Params params; + params["Destination"] = std::string(address); + params["Target"] = std::string("PBAP"); + + method(params, boost::bind(&PbapSession::createSessionCb, this, _1, _2)); + + runMainLoop(); +} + +void PbapSession::createSessionCb(const GDBusCXX::DBusObject_t &session, + const string &error) +{ + if(!error.empty() || session.empty()) { + SE_LOG_ERROR(NULL, NULL, "Error in calling method CreateSession of interface org.openobex.Client: %s", error.c_str()); + exitMainLoop(new std::runtime_error(error)); + return; + } + + m_session.reset(new GDBusCXX::DBusRemoteObject( + m_client.getConnection(), + session, OBC_PBAP_INTERFACE, + OBC_SERVICE, true)); + + GDBusCXX::DBusClientCall0 method(*m_session, "Select"); + method(std::string("int"), std::string("PB"), boost::bind(&PbapSession::selectCb, this, _1)); +} + +void PbapSession::selectCb(const string &error) +{ + if(!error.empty()) { + SE_LOG_ERROR(NULL, NULL, "Error in calling method Select of interface org.openobex.PhonebookAccess: %s", error.c_str()); + exitMainLoop(new std::runtime_error(error)); + return; + } + + exitMainLoop(); +} + +void PbapSession::pullAll(Content &dst) +{ +} + +void PbapSession::shutdown(void) +{ + GDBusCXX::DBusClientCall0 method(m_client, "RemoveSession"); + + method(std::string(m_session->getPath()), boost::bind(&PbapSession::removeSessionCb, this, _1)); + + runMainLoop(); +} + +void PbapSession::removeSessionCb(const string &error) +{ + if(!error.empty()) { + SE_LOG_ERROR(NULL, NULL, "Error in calling method RemoveSession of interface org.openobex.Client: %s", error.c_str()); + exitMainLoop(new std::runtime_error(error)); + return; + } + + m_session.reset(); + + exitMainLoop(); +} + PbapSyncSource::PbapSyncSource(const SyncSourceParams &params) : TrackingSyncSource(params) { diff --git a/src/backends/pbap/pbap.am b/src/backends/pbap/pbap.am index 15b07e2..397d2b3 100644 --- a/src/backends/pbap/pbap.am +++ b/src/backends/pbap/pbap.am @@ -14,9 +14,9 @@ src_backends_pbap_src = \ src/backends/pbap/PbapSyncSource.cpp src_backends_pbap_syncpbap_la_SOURCES = $(src_backends_pbap_src) -src_backends_pbap_syncpbap_la_LIBADD = $(PBAP_LIBS) $(SYNCEVOLUTION_LIBS) -src_backends_pbap_syncpbap_la_LDFLAGS = -module -avoid-version -src_backends_pbap_syncpbap_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) +src_backends_pbap_syncpbap_la_LIBADD = $(PBAP_LIBS) $(SYNCEVOLUTION_LIBS) $(DBUS_LIBS) +src_backends_pbap_syncpbap_la_LDFLAGS = -module -avoid-version $(DBUS_LIBS) +src_backends_pbap_syncpbap_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) $(DBUS_CFLAGS) src_backends_pbap_syncpbap_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS) src_backends_pbap_syncpbap_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS) -- 1.7.6.5

From: Mikel Astiz <mikel.astiz(a)bmw-carit.de&gt; Populates the local cache with the addressbook given by the remote device as result of PullAll(). The LUID is built from the full-name of the vcard entry, combined with a suffix that avoid collisions in case of multiple entries with the same full-name. --- src/backends/pbap/PbapSyncSource.cpp | 80 ++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/src/backends/pbap/PbapSyncSource.cpp b/src/backends/pbap/PbapSyncSource.cpp index 0277e7e..302aadc 100644 --- a/src/backends/pbap/PbapSyncSource.cpp +++ b/src/backends/pbap/PbapSyncSource.cpp @@ -69,6 +69,7 @@ private: void createSessionCb(const GDBusCXX::DBusObject_t &session, const string &error); void selectCb(const string &error); + void pullAllCb(Content *dst, const std::string &content, const string &error); void removeSessionCb(const string &error); static GMainLoop *s_mainloop; @@ -160,6 +161,85 @@ void PbapSession::selectCb(const string &error) void PbapSession::pullAll(Content &dst) { + GDBusCXX::DBusClientCall1<std::string> method(*m_session, "PullAll"); + method(boost::bind(&PbapSession::pullAllCb, this, &dst, _1, _2)); + + runMainLoop(); +} + +void vcardParse(const std::string &content, std::size_t begin, std::size_t end, std::map<std::string, std::string> &dst) +{ + static const boost::char_separator<char> lineSep("\n\r"); + + typedef boost::tokenizer<boost::char_separator<char> > Tokenizer; + Tokenizer tok(content.begin() + begin, content.begin() + end, lineSep); + + for(Tokenizer::iterator it = tok.begin(); it != tok.end(); it ++) { + const std::string &line = *it; + size_t i = line.find(':'); + if(i != std::string::npos) { + std::size_t j = line.find(';'); + j = (j == std::string::npos)? i : j; + std::string key = line.substr(0, j); + std::string value = line.substr(i + 1); + dst[key] = value; + } + } +} + +void PbapSession::pullAllCb(Content *dst, const std::string &content, const string &error) +{ + if(!error.empty() || content.empty()) { + SE_LOG_ERROR(NULL, NULL, "Error in calling method PullAll of interface org.openobex.PhonebookAccess: %s", error.c_str()); + exitMainLoop(new std::runtime_error(error)); + return; + } + + typedef std::map<std::string, int> CounterMap; + CounterMap counterMap; + + std::size_t pos = 0; + while(pos < content.size()) { + static const std::string beginStr("BEGIN:VCARD"); + static const std::string endStr("END:VCARD"); + + pos = content.find(beginStr, pos); + if(pos == std::string::npos) { + break; + } + + std::size_t endPos = content.find(endStr, pos + beginStr.size()); + if(endPos == std::string::npos) { + break; + } + + endPos += endStr.size(); + + typedef std::map<std::string, std::string> VcardMap; + VcardMap vcard; + vcardParse(content, pos, endPos, vcard); + + VcardMap::const_iterator it = vcard.find("FN"); + if(it != vcard.end() && !it->second.empty()) { + const std::string &fn = it->second; + + const std::pair<CounterMap::iterator, bool> &r = + counterMap.insert(CounterMap::value_type(fn, 0)); + if(!r.second) { + r.first->second ++; + } + + char suffix[8]; + sprintf(suffix, "%07d", r.first->second); + + std::string id = fn + std::string(suffix); + (*dst)[id] = content.substr(pos, endPos); + } + + pos = endPos; + } + + exitMainLoop(); } void PbapSession::shutdown(void) -- 1.7.6.5

From: Mikel Astiz <mikel.astiz(a)bmw-carit.de&gt; --- src/backends/pbap/README | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 src/backends/pbap/README diff --git a/src/backends/pbap/README b/src/backends/pbap/README new file mode 100644 index 0000000..0d2c3b4 --- /dev/null +++ b/src/backends/pbap/README @@ -0,0 +1,30 @@ +Usage +===== + +The "pbap" backend provides access to an addressbook stored in a +remote device using the Bluetooth PBAP protocol. This is achieved +using the D-Bus services from obex-client (obexd), which needs to +be running. + +The "database" property specifies the Bluetooth address of the +device to be connected. + +# configure backend +syncevolution --configure \ + syncURL= \ + addressbook/backend=pbap \ + addressbook/database=obex-bt://XX:XX:XX:XX:XX:XX \ + target-config@pbap addressbook + +# print items +syncevolution --print-items \ + target-config@pbap addressbook + +# configure synchronization +syncevolution --configure \ + --template SyncEvolution_Client \ + syncURL=local://@pbap \ + pbap + +# run synchronization +syncevolution --sync refresh-from-client pbap addressbook -- 1.7.6.5