# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1476706575 -10800
# Node ID 481cfea49e1909341e80ee4bb3e1f6bd1714bd76
# Parent  f6274227114b5619671b18e920cb87e1da20ded2
Update counters only per successful operation.

diff -r f6274227114b -r 481cfea49e19 multimerge.py
--- a/multimerge.py	Mon Oct 17 14:06:48 2016 +0300
+++ b/multimerge.py	Mon Oct 17 15:16:15 2016 +0300
@@ -578,13 +578,13 @@
         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"]))
             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()
+                evn_updated += 1
             except Exception as 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:
@@ -592,12 +592,12 @@
             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.
-        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:
             new_event = service.events().insert(calendarId=cfg.dst_id, body=event).execute()
+            evn_new += 1
         except Exception as e:
             gcm_fatal(u"Failed to insert new event:\n\n{0}\n\nERROR: {1}\n".format(event, str(e)))