# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1476702408 -10800
# Node ID f6274227114b5619671b18e920cb87e1da20ded2
# Parent  fc361e368630a560f33d400efe21155f6d7aee59
Make debug/error messages more consistent.

diff -r fc361e368630 -r f6274227114b multimerge.py
--- a/multimerge.py	Mon Oct 17 13:16:32 2016 +0300
+++ b/multimerge.py	Mon Oct 17 14:06:48 2016 +0300
@@ -129,7 +129,7 @@
             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))
+            gcm_print(u"[{0}] {1:25} - {2:25} : {3} [{4}] [{5}]".format(status, ev_start, ev_end, summary, event["iCalUID"], event["id"]))
 
 
 ## Generate gcm IDs for given list of events
@@ -574,26 +574,26 @@
     # Does the event exist already in the target?
     if event["gcm_id"] in dst_ids:
         # Check if event NEEDS updating .. aka compare data
-        gcm_debug(4, u"Event {0} : {1} exists, checking ..".format(event["id"], event["gcm_id"]))
+        gcm_debug(4, u"Event {0} [{1}] exists, checking ..".format(event["id"], event["gcm_id"]))
         d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"])
         if not gcm_compare_events(event, d_event):
             # Seems we need to update
             evn_updated += 1
-            gcm_debug(4, u"Updating event {0} : {1}..".format(event["id"], event["gcm_id"]))
+            gcm_debug(4, u"Updating event {0} [{1}]".format(event["id"], event["gcm_id"]))
             try:
                 event.pop("sequence", None)
                 event.pop("id", None)
                 event["iCalUID"] = event["gcm_id"]
                 new_event = service.events().update(calendarId=cfg.dst_id, eventId=d_event["id"], body=event).execute()
             except Exception as e:
-                gcm_fatal(u"Failed to update event {0}:\n\n{1}\n\nERROR: {2}\n".format(event["gcm_id"], event, str(e)))
+                gcm_fatal(u"Failed to update event {0} [{1}]:\n\n{2}\n\nERROR: {3}\n".format(event["id"], event["gcm_id"], event, str(e)))
         else:
             evn_unchanged += 1
-            gcm_debug(4, u"No need to update event {0} : {1}.".format(event["id"], event["gcm_id"]))
-    else:
+            gcm_debug(4, u"No need to update event {0} [{1}]".format(event["id"], event["gcm_id"]))
+    elif event["status"] != u"cancelled":
         ## Event does not seem to exist. Insert new event.
-        gcm_debug(4, u"Inserting new event {0}".format(event["gcm_id"]))
         evn_new += 1
+        gcm_debug(4, u"Inserting new event {0} [{1}]".format(event["id"], event["gcm_id"]))
         event.pop("id", None)
         event["iCalUID"] = event["gcm_id"]     # Replace Google generated ID with our own
         try:
@@ -610,7 +610,7 @@
 for event in dst_events:
     gcm_debug(4, u"Checking event {0}".format(event["gcm_id"]))
     if not event["gcm_id"] in src_ids and event["status"] != u"cancelled":
-        gcm_debug(4, u"Deleting event {0}".format(event["gcm_id"]))
+        gcm_debug(4, u"Deleting event {0} [{1}]".format(event["id"], event["gcm_id"]))
         evn_purged += 1
         try:
             service.events().delete(calendarId=cfg.dst_id, eventId=event["id"]).execute()