Mercurial > hg > gcmultimerge
changeset 101:b5c381f9b51f
Improve gcm_dump_events() to optionally show all events (deleted/cancelled).
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 17 Oct 2016 12:42:42 +0300 |
parents | b4058d935560 |
children | 7ab6beb4c709 |
files | multimerge.py |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/multimerge.py Tue Oct 11 15:32:14 2016 +0300 +++ b/multimerge.py Mon Oct 17 12:42:42 2016 +0300 @@ -122,12 +122,14 @@ return credentials -def gcm_dump_events(events): +def gcm_dump_events(events, show_all): for event in events: - if event["status"] != u"cancelled": - ev_start = event["start"].get("dateTime", event["start"].get("date")) - ev_end = event["end"].get("dateTime", event["end"].get("date")) - gcm_print(u"{0:25} - {1:25} : {2} {3}".format(ev_start, ev_end, event["summary"], event["id"])) + if event["status"] != u"cancelled" or show_all: + ev_start = event["start"].get("dateTime", event["start"].get("date")) if "start" in event else "?" + ev_end = event["end"].get("dateTime", event["end"].get("date")) if "end" in event else "?" + summary = event["summary"] if "summary" in event else "?" + status = "*" if event["status"] != u"cancelled" else "!" + gcm_print(u"[{4}] {0:25} - {1:25} : {2} [{3}]".format(ev_start, ev_end, summary, event["id"], status)) ## Generate gcm IDs for given list of events @@ -545,7 +547,7 @@ event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"]) src_events.extend(events) if gcm_check_debug(4): - gcm_dump_events(events) + gcm_dump_events(events, True) ## Get current events