comparison multimerge.py @ 101:b5c381f9b51f

Improve gcm_dump_events() to optionally show all events (deleted/cancelled).
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 17 Oct 2016 12:42:42 +0300
parents b4058d935560
children 7ab6beb4c709
comparison
equal deleted inserted replaced
100:b4058d935560 101:b5c381f9b51f
120 if not credentials or credentials.invalid: 120 if not credentials or credentials.invalid:
121 gcm_fatal(u"Failed to authenticate / invalid credentials.") 121 gcm_fatal(u"Failed to authenticate / invalid credentials.")
122 return credentials 122 return credentials
123 123
124 124
125 def gcm_dump_events(events): 125 def gcm_dump_events(events, show_all):
126 for event in events: 126 for event in events:
127 if event["status"] != u"cancelled": 127 if event["status"] != u"cancelled" or show_all:
128 ev_start = event["start"].get("dateTime", event["start"].get("date")) 128 ev_start = event["start"].get("dateTime", event["start"].get("date")) if "start" in event else "?"
129 ev_end = event["end"].get("dateTime", event["end"].get("date")) 129 ev_end = event["end"].get("dateTime", event["end"].get("date")) if "end" in event else "?"
130 gcm_print(u"{0:25} - {1:25} : {2} {3}".format(ev_start, ev_end, event["summary"], event["id"])) 130 summary = event["summary"] if "summary" in event else "?"
131 status = "*" if event["status"] != u"cancelled" else "!"
132 gcm_print(u"[{4}] {0:25} - {1:25} : {2} [{3}]".format(ev_start, ev_end, summary, event["id"], status))
131 133
132 134
133 ## Generate gcm IDs for given list of events 135 ## Generate gcm IDs for given list of events
134 def gcm_generate_ids(events, calendar_id, sep): 136 def gcm_generate_ids(events, calendar_id, sep):
135 if not events: 137 if not events:
543 if c_found != None: 545 if c_found != None:
544 event["colorId"] = c_found 546 event["colorId"] = c_found
545 event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"]) 547 event["summary"] = u"[{1}] {0}".format(event["summary"], calendar["gcm_id"])
546 src_events.extend(events) 548 src_events.extend(events)
547 if gcm_check_debug(4): 549 if gcm_check_debug(4):
548 gcm_dump_events(events) 550 gcm_dump_events(events, True)
549 551
550 552
551 ## Get current events 553 ## Get current events
552 gcm_debug(3, u"Fetching current target calendar events.") 554 gcm_debug(3, u"Fetching current target calendar events.")
553 result = service.events().list( 555 result = service.events().list(