# HG changeset patch # User Matti Hamalainen # Date 1467707125 -10800 # Node ID 693db3f8cbe5336b123946c0922fee9df64bbfef # Parent 54405de302d041d1d33d7cd630477e925054806d Begin importing event comparision stuff. diff -r 54405de302d0 -r 693db3f8cbe5 multimerge.py --- a/multimerge.py Tue Jul 05 10:50:22 2016 +0300 +++ b/multimerge.py Tue Jul 05 11:25:25 2016 +0300 @@ -420,10 +420,17 @@ # Does the event exist already in the target? if event["gcm_id"] in dst_gcm_ids: ## Yes. Thus, we just update the event. - try: - new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute() - except Exception as e: - gcm_fatal("Failed to update event:\n{0}\n\nERROR: {1}\n".format(event, str(e))) + print "IS in dst_gcm_ids: "+ event["id"] +" : "+ event["gcm_id"] + # Check if event NEEDS updating .. aka compare data + #d_event = gcm_get_event_by_gcm_id(dst_events, event["gcm_id"]) + #if d_event and gcm_compare_events(event, d_event): + if True: + try: + new_event = service.events().update(calendarId=cfg.dest_id, eventId=event["id"], body=event).execute() + except Exception as e: + gcm_fatal("Failed to update event:\n{0}\n\nERROR: {1}\n".format(event, str(e))) + else: + gcm_debug("No need to update event {0}.".format(event["gcm_id"]) else: ## Event does not seem to exist. Insert new event. event.pop("iCalUID", None) # Remove the iCalUID, having it conflicts with event ID