# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1476697362 -10800
# Node ID b5c381f9b51ff3e36ce5d14f1943e2c0138b2c3d
# Parent  b4058d9355607ce03e8d88d947501c523289bfb0
Improve gcm_dump_events() to optionally show all events (deleted/cancelled).

diff -r b4058d935560 -r b5c381f9b51f multimerge.py
--- 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