From 3dbfc7c1f5d9451dbf8fc37fc621c7cc80010214 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 26 Jan 2016 17:33:49 +0100 Subject: calcurse-caldav: Use calendar-multiget to obtain ETag Some CalDAV servers do not support calendar-query with a UID filter. Use a calendar-multiget request to obtain the ETag of submitted objects instead. Signed-off-by: Lukas Fleischer --- contrib/caldav/calcurse-caldav.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'contrib') diff --git a/contrib/caldav/calcurse-caldav.py b/contrib/caldav/calcurse-caldav.py index 9b6d77e..9cdd255 100755 --- a/contrib/caldav/calcurse-caldav.py +++ b/contrib/caldav/calcurse-caldav.py @@ -118,19 +118,21 @@ def remote_query(cmd, path, additional_headers, body): return (headers, body) -def get_hrefmap(conn, uid=None): - if uid: - propfilter = ('' + - '%s' + - '') % (uid) +def get_hrefmap(conn, hrefs=[]): + if len(hrefs) > 0: + body = '' +\ + '' +\ + '' + for href in hrefs: + body += '{}'.format(href) + body += '' else: - propfilter = '' + body = '' +\ + '' +\ + '' +\ + '' +\ + '' - body = '' +\ - '' +\ - '' +\ - '' + propfilter + '' +\ - '' headers, body = remote_query("REPORT", path, {}, body) if not headers: return {} @@ -186,8 +188,9 @@ def save_syncdb(fn, syncdb): print("%s %s" % (etag, objhash), file=f) def push_object(conn, objhash): + href = path + objhash + ".ics" body = calcurse_export(objhash) - headers, body = remote_query("PUT", path + objhash + ".ics", {}, body) + headers, body = remote_query("PUT", href, {}, body) if not headers: return None @@ -197,9 +200,9 @@ def push_object(conn, objhash): if 'etag' in headerdict: etag = headerdict['etag'] while not etag: - hrefmap = get_hrefmap(conn, objhash) + hrefmap = get_hrefmap(conn, [href]) if len(hrefmap.keys()) > 0: - etag = hrefmap.keys()[0] + etag = next(iter(hrefmap.keys())) etag = etag.strip('"') return etag -- cgit v1.2.3-70-g09d2