maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WebDAV: handle more than one entry in calendar/addresbook-home-set

Browse source 
These properties may contain more than one href. eGroupware does for
address books when the user configures to expose more than one address
book in the web interface for GroupDAV.

Now SyncEvolution adds all of these URLs as candidates. Ordering is
preserved, so the first URL in the property is also visited first (=
becomes the default).
This commit is contained in:
Patrick Ohly 2011-10-04 16:11:26 +02:00
parent 40bf05f6f1
commit 7cf726d7c9
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/backends/webdav/WebDAVSource.cpp
View file

@ -754,11 +754,18 @@ bool WebDAVSource::findCollections(const boost::function<bool (const std::string
// find next path:
// prefer CardDAV:calendar-home-set or CalDAV:addressbook-home-set
std::string home = extractHREF(props[homeSetProp()]);
if (!home.empty() &&
tried.find(home) == tried.end()) {
next = home;
SE_LOG_DEBUG(NULL, NULL, "follow home-set property to %s", next.c_str());
std::list<std::string> homes = extractHREFs(props[homeSetProp()]);
BOOST_FOREACH(const std::string &home, homes) {
if (!home.empty() &&
tried.find(home) == tried.end()) {
if (next.empty()) {
SE_LOG_DEBUG(NULL, NULL, "follow home-set property to %s", home.c_str());
next = home;
} else {
SE_LOG_DEBUG(NULL, NULL, "new candidate from home-set property %s", home.c_str());
candidates.push_front(home);
}
}
}
// alternatively, follow principal URL
if (next.empty()) {
@ -874,6 +881,33 @@ std::string WebDAVSource::extractHREF(const std::string &propval)
return "";
}
std::list<std::string> WebDAVSource::extractHREFs(const std::string &propval)
{
std::list<std::string> res;
// all additional parameters after opening resp. closing tag
static const std::string hrefStart = "<DAV:href";
static const std::string hrefEnd = "</DAV:href";
size_t current = 0;
while (current < propval.size()) {
size_t start = propval.find(hrefStart, current);
start = propval.find('>', start);
if (start != propval.npos) {
start++;
size_t end = propval.find(hrefEnd, start);
if (end != propval.npos) {
res.push_back(propval.substr(start, end - start));
current = end;
} else {
break;
}
} else {
break;
}
}
return res;
}
void WebDAVSource::openPropCallback(const Neon::URI &uri,
const ne_propname *prop,
const char *value,

2
src/backends/webdav/WebDAVSource.h
View file

@ -197,6 +197,8 @@ class WebDAVSource : public TrackingSyncSource, private boost::noncopyable
/** extract value from first <DAV:href>value</DAV:href>, empty string if not inside propval */
std::string extractHREF(const std::string &propval);
/** extract all <DAV:href>value</DAV:href> values from a set, empty if none */
std::list<std::string> extractHREFs(const std::string &propval);
void openPropCallback(const Neon::URI &uri,
const ne_propname *prop,