# HG changeset patch # User Matti Hamalainen # Date 1467748860 -10800 # Node ID 597875ef885b6936eb4b7b4f7458b2256151700b # Parent 5b78f62b7de7dc2187cf5b4aa645f18df47fd7c6 Better debug prints. diff -r 5b78f62b7de7 -r 597875ef885b multimerge.py --- a/multimerge.py Tue Jul 05 21:18:03 2016 +0300 +++ b/multimerge.py Tue Jul 05 23:01:00 2016 +0300 @@ -103,6 +103,8 @@ ev_end = event["end"].get("dateTime", event["end"].get("date")) gcm_print(u"{0:25} - {1:25} : {2}".format(ev_start, ev_end, event["summary"])) + +## Generate gcm IDs for given list of events def gcm_generate_ids(events, calendar_id): if not events: return events @@ -456,11 +458,10 @@ ## Yes. Thus, we just update the event. #print "IS in dst_ids: "+ event["id"] +" : "+ event["gcm_id"] # Check if event NEEDS updating .. aka compare data - gcm_debug(u"Updating event {0}".format(event["gcm_id"])) + gcm_debug(u"Event {0} exists, checking ..".format(event["gcm_id"])) d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"]) - if not d_event: - gcm_fatal("ASDF") if not gcm_compare_events(event, d_event): + gcm_debug(u"Updating event {0} ..".format(event["gcm_id"])) try: event.pop("sequence", None) new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute() @@ -481,6 +482,7 @@ ## Remove "stale" events gcm_debug(u"Purging stale events ..") for event in dst_events: + gcm_debug(u"Checking event {0}".format(event["gcm_id"])) if not event["gcm_id"] in src_ids and event["status"] != u"cancelled": gcm_debug(u"Deleting event {0}".format(event["gcm_id"])) # try: